Prepare for 0.6.4 (#1909)

* Fix DOM updates on AJAX requests (#1906)

* Search scopes by ID (#1907)

* Search scopes by ID

* Add CHANGELOG entry

* Bump version

* Use correct docker image version

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: codegram/decidim
+      - image: codegram/decidim:0.6.4
         environment:
           SIMPLECOV: true
           DATABASE_USERNAME: postgres

CHANGELOG.md

@@ -2,12 +2,20 @@
 
 ## [Unreleased](https://github.com/decidim/decidim/tree/HEAD)
 
+## [v0.6.4](https://github.com/decidim/decidim/tree/v0.6.3) (2017-09-21)
+[Full Changelog](https://github.com/decidim/decidim/compare/v0.6.3...v0.6.4)
+
+**Fixed**
+- **decidim-core**: Some AJAX requests were not updating the DOM properly [\#1906](https://github.com/decidim/decidim/pull/1906)
+- **decidim-core**: Fixes proposals filter when filtering by scopes [\#1907](https://github.com/decidim/decidim/pull/1907)
+
 ## [v0.6.3](https://github.com/decidim/decidim/tree/v0.6.3) (2017-09-20)
 [Full Changelog](https://github.com/decidim/decidim/compare/v0.6.2...v0.6.3)
 
 **Fixed**
 
 - **decidim-core**: On certain cases, authorizations controller was trying to redirect to an unexisting path. Fixed now. [\#1882](https://github.com/decidim/decidim/pull/1882)
+- **decidim-participatory-processes**: When visiting the process page on a multiple language organization and the URL had the deafult locale as a param, link to the resource itself was not being properly highlighted [\#1892](https://github.com/decidim/decidim/pull/1892)
 
 **Added**
 ## [v0.6.2](https://github.com/decidim/decidim/tree/v0.6.2) (2017-09-19)

Gemfile.lock

@@ -1,22 +1,22 @@
 PATH
   remote: .
   specs:
-    decidim (0.6.3)
-      decidim-admin (= 0.6.3)
-      decidim-api (= 0.6.3)
-      decidim-budgets (= 0.6.3)
-      decidim-comments (= 0.6.3)
-      decidim-core (= 0.6.3)
-      decidim-meetings (= 0.6.3)
-      decidim-pages (= 0.6.3)
-      decidim-participatory_processes (= 0.6.3)
-      decidim-proposals (= 0.6.3)
-      decidim-results (= 0.6.3)
-      decidim-surveys (= 0.6.3)
-      decidim-system (= 0.6.3)
-    decidim-admin (0.6.3)
+    decidim (0.6.4)
+      decidim-admin (= 0.6.4)
+      decidim-api (= 0.6.4)
+      decidim-budgets (= 0.6.4)
+      decidim-comments (= 0.6.4)
+      decidim-core (= 0.6.4)
+      decidim-meetings (= 0.6.4)
+      decidim-pages (= 0.6.4)
+      decidim-participatory_processes (= 0.6.4)
+      decidim-proposals (= 0.6.4)
+      decidim-results (= 0.6.4)
+      decidim-surveys (= 0.6.4)
+      decidim-system (= 0.6.4)
+    decidim-admin (0.6.4)
       active_link_to (~> 1.0.0)
-      decidim-core (= 0.6.3)
+      decidim-core (= 0.6.4)
       devise (~> 4.2)
       devise-i18n (~> 1.1.0)
       devise_invitable (~> 1.7.0)
@@ -26,29 +26,29 @@ PATH
       rectify (~> 0.9.1)
       sassc-rails (~> 1.3.0)
       select2-rails (~> 4.0.3)
-    decidim-api (0.6.3)
+    decidim-api (0.6.4)
       graphiql-rails (~> 1.4.2)
       graphql (~> 1.6.0)
       rack-cors (~> 0.4.0)
       rails (~> 5.1.3)
       sprockets-es6 (~> 0.9.2)
-    decidim-budgets (0.6.3)
-      decidim-comments (= 0.6.3)
-      decidim-core (= 0.6.3)
+    decidim-budgets (0.6.4)
+      decidim-comments (= 0.6.4)
+      decidim-core (= 0.6.4)
       kaminari (~> 1.0.1)
       rectify (~> 0.9.1)
       searchlight (~> 4.1.0)
-    decidim-comments (0.6.3)
-      decidim-core (= 0.6.3)
+    decidim-comments (0.6.4)
+      decidim-core (= 0.6.4)
       jquery-rails (~> 4.0)
       rails (~> 5.1.3)
-    decidim-core (0.6.3)
+    decidim-core (0.6.4)
       active_link_to (~> 1.0.4)
       autoprefixer-rails (~> 7.1.1)
       cancancan (~> 2.0.0)
       carrierwave (~> 1.1.0)
       date_validator (~> 0.9.0)
-      decidim-api (= 0.6.3)
+      decidim-api (= 0.6.4)
       devise (~> 4.3)
       devise-i18n (~> 1.1.0)
       file_validators (~> 2.1.0)
@@ -76,39 +76,39 @@ PATH
       sprockets-es6 (~> 0.9.2)
       truncato (~> 0.7.9)
       wisper (~> 2.0.0)
-    decidim-meetings (0.6.3)
+    decidim-meetings (0.6.4)
       date_validator (~> 0.9)
-      decidim-core (= 0.6.3)
+      decidim-core (= 0.6.4)
       httparty (~> 0.15.0)
       icalendar (~> 2.4.1)
       jquery-tmpl-rails (~> 1.1.0)
       kaminari (~> 1.0.1)
       rectify (~> 0.8)
       searchlight (~> 4.1.0)
-    decidim-pages (0.6.3)
-      decidim-core (= 0.6.3)
+    decidim-pages (0.6.4)
+      decidim-core (= 0.6.4)
       rectify (~> 0.9.1)
-    decidim-participatory_processes (0.6.3)
-      decidim-core (= 0.6.3)
+    decidim-participatory_processes (0.6.4)
+      decidim-core (= 0.6.4)
       rails (~> 5.1.3)
-    decidim-proposals (0.6.3)
-      decidim-comments (= 0.6.3)
-      decidim-core (= 0.6.3)
+    decidim-proposals (0.6.4)
+      decidim-comments (= 0.6.4)
+      decidim-core (= 0.6.4)
       kaminari (~> 1.0.1)
       rectify (~> 0.9.1)
       social-share-button (~> 0.10.0)
-    decidim-results (0.6.3)
-      decidim-comments (= 0.6.3)
-      decidim-core (= 0.6.3)
+    decidim-results (0.6.4)
+      decidim-comments (= 0.6.4)
+      decidim-core (= 0.6.4)
       kaminari (~> 1.0.1)
       rectify (~> 0.9.1)
       searchlight (~> 4.1.0)
-    decidim-surveys (0.6.3)
-      decidim-core (= 0.6.3)
+    decidim-surveys (0.6.4)
+      decidim-core (= 0.6.4)
       jquery-tmpl-rails (~> 1.1.0)
-    decidim-system (0.6.3)
+    decidim-system (0.6.4)
       active_link_to (~> 1.0.0)
-      decidim-core (= 0.6.3)
+      decidim-core (= 0.6.4)
       devise (~> 4.2)
       devise-i18n (~> 1.1.0)
       devise_invitable (~> 1.7.1)
@@ -121,14 +121,14 @@ PATH
 PATH
   remote: decidim-dev
   specs:
-    decidim-dev (0.6.3)
+    decidim-dev (0.6.4)
       byebug
       capybara (~> 2.15.0)
       capybara-screenshot (~> 1.0.14)
       codecov (~> 0.1.9)
       database_cleaner (~> 1.6.0)
       db-query-matchers (~> 0.9.0)
-      decidim (= 0.6.3)
+      decidim (= 0.6.4)
       factory_girl_rails
       faker (~> 1.8.4)
       i18n-tasks (= 0.9.18)

decidim-budgets/app/views/decidim/budgets/line_items/update_budget.js.erb

@@ -5,20 +5,20 @@ var $projectItem = $('#project-<%= project.id %>-item');
 var $projectBudgetButton = $('#project-<%= project.id %>-budget-button');
 var $budgetConfirm = $('#budget-confirm');
 
-morphdom($orderTotalBudget[0], '<%= j(render partial: 'decidim/budgets/projects/order_total_budget') %>');
-morphdom($orderSelectedProjects[0], '<%= j(render partial: 'decidim/budgets/projects/order_selected_projects') %>');
-morphdom($orderProgress[0], '<%= j(render partial: 'decidim/budgets/projects/order_progress') %>');
-morphdom($budgetConfirm[0], '<%= j(render partial: 'decidim/budgets/projects/budget_confirm') %>')
+morphdom($orderTotalBudget[0], '<%= j(render partial: 'decidim/budgets/projects/order_total_budget').strip.html_safe %>');
+morphdom($orderSelectedProjects[0], '<%= j(render partial: 'decidim/budgets/projects/order_selected_projects').strip.html_safe %>');
+morphdom($orderProgress[0], '<%= j(render partial: 'decidim/budgets/projects/order_progress').strip.html_safe %>');
+morphdom($budgetConfirm[0], '<%= j(render partial: 'decidim/budgets/projects/budget_confirm').strip.html_safe %>')
 
 $("#order-progress").foundation();
 $(".budget-summary__selected").foundation();
 
 if ($projectItem.length > 0) {
-  morphdom($projectItem[0], '<%= j(render partial: 'decidim/budgets/projects/project', locals: { project: project }) %>');
+  morphdom($projectItem[0], '<%= j(render partial: 'decidim/budgets/projects/project', locals: { project: project }).strip.html_safe %>');
 }
 
 if ($projectBudgetButton.length > 0) {
-  morphdom($projectBudgetButton[0], '<%= j(render partial: 'decidim/budgets/projects/project_budget_button', locals: { project: project }) %>');
+  morphdom($projectBudgetButton[0], '<%= j(render partial: 'decidim/budgets/projects/project_budget_button', locals: { project: project }).strip.html_safe %>');
 }
 
 window.DecidimBudgets.checkProgressPosition();

decidim-budgets/app/views/decidim/budgets/projects/index.js.erb

@@ -1,2 +1,2 @@
 var $projects = $('#projects');
-$projects.html('<%= j(render partial: "projects") %>');
+$projects.html('<%= j(render partial: "projects").strip.html_safe %>');

decidim-core/app/services/decidim/resource_search.rb

@@ -43,9 +43,15 @@ def search_scope_id
 
       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

decidim-core/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

decidim-meetings/app/views/decidim/meetings/meetings/index.js.erb

@@ -1,6 +1,6 @@
 var $meetings = $('#meetings');
 
-$meetings.html('<%= j(render partial: "meetings") %>');
+$meetings.html('<%= j(render partial: "meetings").strip.html_safe %>');
 
 var $dropdownMenu = $('.dropdown.menu', $meetings);
 $dropdownMenu.foundation();

decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_processes/index.js.erb

@@ -1,6 +1,6 @@
 const $grid = $('#processes-grid');
 const $loading = $grid.find('.loading');
 
-$grid.find('.card-grid').html('<%= j render(collection) || render(partial: "no_processes_yet") %>');
-$grid.find('.processes-grid-order-by').html('<%= j render(partial: "decidim/participatory_processes/order_by_processes", locals: { include_filter: true }) %>');
+$grid.find('.card-grid').html('<%= j(render(collection) || render(partial: "no_processes_yet")).strip.html_safe %>');
+$grid.find('.processes-grid-order-by').html('<%= j(render(partial: "decidim/participatory_processes/order_by_processes", locals: { include_filter: true })).strip.html_safe %>');
 $loading.hide();

decidim-proposals/app/views/decidim/proposals/proposal_votes/update_buttons_and_counters.js.erb

@@ -1,14 +1,14 @@
 var $proposalVotesCount = $('#proposal-<%= proposal.id %>-votes-count');
 var $proposalVoteButton = $('#proposal-<%= proposal.id %>-vote-button');
 
-morphdom($proposalVotesCount[0], '<%= j(render partial: 'decidim/proposals/proposals/votes_count', locals: { proposal: proposal, from_proposals_list: @from_proposals_list }) %>');
-morphdom($proposalVoteButton[0], '<%= j(render partial: 'decidim/proposals/proposals/vote_button', locals: { proposal: proposal, from_proposals_list: @from_proposals_list }) %>');
+morphdom($proposalVotesCount[0], '<%= j(render partial: 'decidim/proposals/proposals/votes_count', locals: { proposal: proposal, from_proposals_list: @from_proposals_list }).strip.html_safe %>');
+morphdom($proposalVoteButton[0], '<%= j(render partial: 'decidim/proposals/proposals/vote_button', locals: { proposal: proposal, from_proposals_list: @from_proposals_list }).strip.html_safe %>');
 
 <% if vote_limit_enabled? %>
   var $remainingVotesCount = $('#remaining-votes-count');
   var $notVotedButtons = $('.card__button.button').not('.success');
 
-  morphdom($remainingVotesCount[0], '<%= j(render partial: 'decidim/proposals/proposals/remaining_votes_count') %>');
+  morphdom($remainingVotesCount[0], '<%= j(render partial: 'decidim/proposals/proposals/remaining_votes_count').strip.html_safe %>');
 
   <% if remaining_votes_count_for(current_user) == 0 %>
     $notVotedButtons.attr('disabled', true);

decidim-proposals/app/views/decidim/proposals/proposals/index.js.erb

@@ -2,8 +2,8 @@ var $proposals = $('#proposals');
 var $proposalsCount = $('#proposals-count');
 var $orderFilterInput = $('.order_filter');
 
-$proposals.html('<%= j(render partial: "proposals") %>');
-$proposalsCount.html('<%= j(render partial: "count") %>');
+$proposals.html('<%= j(render partial: "proposals").strip.html_safe %>');
+$proposalsCount.html('<%= j(render partial: "count").strip.html_safe %>');
 $orderFilterInput.val('<%= order %>');
 
 var $dropdownMenu = $('.dropdown.menu', $proposals);

decidim-results/app/views/decidim/results/results/index.js.erb

@@ -1,5 +1,5 @@
 var $results = $('#results');
-$results.html('<%= j(render partial: "results") %>');
+$results.html('<%= j(render partial: "results").strip.html_safe %>');
 
 var $dropdownMenu = $('.dropdown.menu', $results);
 $dropdownMenu.foundation();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "decidim",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "repository": {
     "url": "git@github.com:decidim/decidim.git",
     "type": "git"