decidim-core 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a7d0000ad1d10c51dad0ce1984d129067a12094
-  data.tar.gz: 8211ed8f338526799238ad9cd77181d50cd0207e
+  metadata.gz: e779623f418954e17c49bbbe1aed14d42299398e
+  data.tar.gz: e8e12710f5181dc29d7b8fa72e665eb1ece8eb90
 SHA512:
-  metadata.gz: 8d0b2bbd6810b6f6a3cd5e3bdb8fe55a29c661f1a40271300e0bc314b04a257893e5adc6444a1ea1a7833fcbc9b3ee6fb0e8f772c580a2bcb34122174b9d52d6
-  data.tar.gz: 6c5674c10710dea09ae2ddfbfc431947fba95209fdb1257911ed4c632f33b8a4b77b3bedc65110b3c54edccff85ef3479fb8cb5b1f5120be59c24add4aaca13d
+  metadata.gz: 5be5179eeed80a0941a93b1fdb1c3e18c0a3f688d4876be4abf0fd7bbeb013b212cdbb784bce864ba40c34e829cdd090dd768f90a5442564a1cf4162d7b84228
+  data.tar.gz: bf4373a5f5e9be5ceb6ee9edb388293d515891de27ffd1aff0dc66097b418f76ab17dda44edd364c57935e90c6fc0a36b2ccadeb23ebe0f7060a233b0ea6d4ac

data/app/services/decidim/resource_search.rb

@@ -43,9 +43,15 @@ module Decidim
 
       conditions = []
       conditions << "decidim_scope_id IS NULL" if clean_scope_ids.delete("global")
-      conditions.concat(["? = ANY(decidim_scopes.part_of)"] * clean_scope_ids.count) if clean_scope_ids.any?
 
-      query.includes(:scope).references(:decidim_scopes).where(conditions.join(" OR "), *clean_scope_ids.map(&:to_i))
+      clean_scope_ids.map!(&:to_i)
+
+      if clean_scope_ids.any?
+        conditions.concat(["? = ANY(decidim_scopes.part_of)"] * clean_scope_ids.count)
+        conditions << "decidim_scopes.id IN (?)"
+      end
+
+      query.includes(:scope).references(:decidim_scopes).where(conditions.join(" OR "), *clean_scope_ids, clean_scope_ids)
     end
 
     private

data/lib/decidim/core/version.rb

@@ -3,7 +3,7 @@
 # This holds Decidim's version and the Rails version on which it depends.
 module Decidim
   def self.version
-    "0.6.3"
+    "0.6.4"
   end
 
   def self.rails_version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-20 00:00:00.000000000 Z
+date: 2017-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -466,84 +466,84 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.6.4
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.6.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.6.4
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.6.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.6.4
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.6.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.6.4
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.6.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.6.4
 - !ruby/object:Gem::Dependency
   name: decidim-results
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.6.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.6.4
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com