decidim 0.5.1 → 0.6.0

data/decidim-proposals/spec/queries/decidim/proposals/filtered_proposals_spec.rb

@@ -5,8 +5,8 @@ require "spec_helper"
 describe Decidim::Proposals::FilteredProposals do
   let(:organization) { create(:organization) }
   let(:participatory_process) { create(:participatory_process, organization: organization) }
-  let(:feature) { create(:proposal_feature, participatory_process: participatory_process) }
-  let(:another_feature) { create(:proposal_feature, participatory_process: participatory_process) }
+  let(:feature) { create(:proposal_feature, participatory_space: participatory_process) }
+  let(:another_feature) { create(:proposal_feature, participatory_space: participatory_process) }
 
   let(:proposals) { create_list(:proposal, 3, feature: feature) }
   let(:old_proposals) { create_list(:proposal, 3, feature: feature, created_at: 10.days.ago) }

data/decidim-proposals/spec/services/decidim/proposals/proposal_search_spec.rb

@@ -9,7 +9,7 @@ module Decidim
       let(:scope1) { create :scope, organization: feature.organization }
       let(:scope2) { create :scope, organization: feature.organization }
       let(:subscope1) { create :scope, organization: feature.organization, parent: scope1 }
-      let(:participatory_process) { feature.participatory_process }
+      let(:participatory_process) { feature.participatory_space }
       let(:user) { create(:user, organization: feature.organization) }
       let!(:proposal) { create(:proposal, feature: feature, scope: scope1) }
 
@@ -167,7 +167,7 @@ module Decidim
         describe "when the filter includes related_to" do
           context "when filtering by related to meetings" do
             let(:related_to) { "Decidim::Meetings::Meeting".underscore }
-            let(:meetings_feature) { create(:feature, manifest_name: "meetings", participatory_process: participatory_process) }
+            let(:meetings_feature) { create(:feature, manifest_name: "meetings", participatory_space: participatory_process) }
             let(:meeting) { create :meeting, feature: meetings_feature }
 
             it "returns only proposals related to meetings" do
@@ -183,7 +183,7 @@ module Decidim
 
           context "when filtering by related to results" do
             let(:related_to) { "Decidim::Results::Result".underscore }
-            let(:results_feature) { create(:feature, manifest_name: "results", participatory_process: participatory_process) }
+            let(:results_feature) { create(:feature, manifest_name: "results", participatory_space: participatory_process) }
             let(:result) { create :result, feature: results_feature }
 
             it "returns only proposals related to results" do

data/decidim-proposals/spec/services/decidim/proposals/proposal_serializer_spec.rb

@@ -6,12 +6,12 @@ module Decidim
   module Proposals
     describe ProposalSerializer do
       let!(:proposal) { create(:proposal) }
-      let!(:category) { create(:category, participatory_process: feature.participatory_process) }
-      let!(:scope) { create(:scope, organization: feature.participatory_process.organization) }
-      let(:participatory_process) { feature.participatory_process }
+      let!(:category) { create(:category, participatory_space: feature.participatory_space) }
+      let!(:scope) { create(:scope, organization: feature.participatory_space.organization) }
+      let(:participatory_process) { feature.participatory_space }
       let(:feature) { proposal.feature }
 
-      let!(:meetings_feature) { create(:feature, manifest_name: "meetings", participatory_process: participatory_process) }
+      let!(:meetings_feature) { create(:feature, manifest_name: "meetings", participatory_space: participatory_process) }
       let(:meetings) { create_list(:meeting, 2, feature: meetings_feature) }
 
       before do

data/decidim-proposals/spec/shared/manage_proposals_examples.rb

@@ -35,11 +35,13 @@ shared_examples "manage proposals" do
         before do
           current_feature.update_attributes!(
             step_settings: {
-              current_feature.participatory_process.active_step.id => {
+              current_feature.participatory_space.active_step.id => {
                 creation_enabled: true
               }
             }
           )
+
+          visit_feature_admin
         end
 
         context "when process is not related to any scope" do
@@ -86,7 +88,7 @@ shared_examples "manage proposals" do
           end
 
           it "cannot be related to a scope" do
-            find(".card-title a.button").click
+            click_link "New"
 
             within "form" do
               expect(page).to have_no_content(/Scope/i)
@@ -94,7 +96,7 @@ shared_examples "manage proposals" do
           end
 
           it "creates a new proposal related to the process scope" do
-            find(".card-title a.button").click
+            click_link "New"
 
             within ".new_proposal" do
               fill_in :proposal_title, with: "Make decidim great again"
@@ -123,7 +125,7 @@ shared_examples "manage proposals" do
             end
 
             it "creates a new proposal related to the process scope" do
-              find(".card-title a.button").click
+              click_link "New"
 
               within ".new_proposal" do
                 fill_in :proposal_title, with: "Make decidim great again"
@@ -181,6 +183,28 @@ shared_examples "manage proposals" do
           end
         end
       end
+
+      context "when creation is not enabled" do
+        before do
+          current_feature.update_attributes!(
+            step_settings: {
+              current_feature.participatory_space.active_step.id => {
+                creation_enabled: false
+              }
+            }
+          )
+        end
+
+        it "cannot create a new proposal from the main site" do
+          visit_feature
+          expect(page).to have_no_button("New Proposal")
+        end
+
+        it "cannot create a new proposal from the admin site" do
+          visit_feature_admin
+          expect(page).to have_no_link(/New/)
+        end
+      end
     end
 
     context "when official_proposals setting is disabled" do
@@ -188,9 +212,14 @@ shared_examples "manage proposals" do
         current_feature.update_attributes!(settings: { official_proposals_enabled: false })
       end
 
-      it "cannot create a new proposal" do
+      it "cannot create a new proposal from the main site" do
         visit_feature
-        expect(page).to have_no_content("New Proposal")
+        expect(page).to have_no_button("New Proposal")
+      end
+
+      it "cannot create a new proposal from the admin site" do
+        visit_feature_admin
+        expect(page).to have_no_link(/New/)
       end
     end
   end
@@ -204,7 +233,7 @@ shared_examples "manage proposals" do
       before do
         current_feature.update_attributes!(
           step_settings: {
-            current_feature.participatory_process.active_step.id => {
+            current_feature.participatory_space.active_step.id => {
               proposal_answering_enabled: true
             }
           }
@@ -233,7 +262,7 @@ shared_examples "manage proposals" do
         end
 
         within find("tr", text: proposal.title) do
-          within find("td:nth-child(4)") do
+          within find("td:nth-child(5)") do
             expect(page).to have_content("Rejected")
           end
         end
@@ -254,7 +283,7 @@ shared_examples "manage proposals" do
         end
 
         within find("tr", text: proposal.title) do
-          within find("td:nth-child(4)") do
+          within find("td:nth-child(5)") do
             expect(page).to have_content("Accepted")
           end
         end
@@ -275,7 +304,7 @@ shared_examples "manage proposals" do
         end
 
         within find("tr", text: proposal.title) do
-          within find("td:nth-child(4)") do
+          within find("td:nth-child(5)") do
             expect(page).to have_content("Evaluating")
           end
         end
@@ -290,10 +319,10 @@ shared_examples "manage proposals" do
           answered_at: Time.current
         )
 
-        visit manage_feature_path(current_feature)
+        visit_feature_admin
 
         within find("tr", text: proposal.title) do
-          within find("td:nth-child(4)") do
+          within find("td:nth-child(5)") do
             expect(page).to have_content("Rejected")
           end
           find("a.action-icon--edit-answer").click
@@ -309,7 +338,7 @@ shared_examples "manage proposals" do
         end
 
         within find("tr", text: proposal.title) do
-          within find("td:nth-child(4)") do
+          within find("td:nth-child(5)") do
             expect(page).to have_content("Accepted")
           end
         end
@@ -320,7 +349,7 @@ shared_examples "manage proposals" do
       before do
         current_feature.update_attributes!(
           step_settings: {
-            current_feature.participatory_process.active_step.id => {
+            current_feature.participatory_space.active_step.id => {
               proposal_answering_enabled: false
             }
           }
@@ -331,7 +360,7 @@ shared_examples "manage proposals" do
         visit current_path
 
         within find("tr", text: proposal.title) do
-          expect(page).to have_no_css("a", text: "Answer")
+          expect(page).to have_no_link("Answer")
         end
       end
     end
@@ -346,7 +375,7 @@ shared_examples "manage proposals" do
       visit current_path
 
       within find("tr", text: proposal.title) do
-        expect(page).to have_no_css("a", text: "Answer")
+        expect(page).to have_no_link("Answer")
       end
     end
   end

data/decidim-proposals/spec/shared/proposal_form_examples.rb

@@ -5,7 +5,7 @@ shared_examples "a proposal form" do
   let(:title) { "Oriol for president!" }
   let(:body) { "Everything would be better" }
   let(:author) { create(:user, organization: feature.organization) }
-  let(:category) { create(:category, participatory_process: feature.participatory_process) }
+  let(:category) { create(:category, participatory_space: feature.participatory_space) }
   let(:scope) { create(:scope, organization: feature.organization) }
   let(:category_id) { category.try(:id) }
   let(:scope_id) { scope.try(:id) }

data/decidim-proposals/spec/shared/proposals_help_texts_examples.rb

@@ -4,7 +4,7 @@ shared_examples "manage proposals help texts" do
   before do
     current_feature.update_attributes(
       step_settings: {
-        current_feature.participatory_process.active_step.id => {
+        current_feature.participatory_space.active_step.id => {
           creation_enabled: true
         }
       }
@@ -24,10 +24,16 @@ shared_examples "manage proposals help texts" do
 
     click_button "Update"
 
-    visit decidim_proposals.new_proposal_path(feature_id: current_feature.id, participatory_process_id: current_feature.participatory_process.id)
+    visit new_proposal_path(current_feature)
 
     within ".callout.secondary" do
       expect(page).to have_content("Create a proposal following our guidelines.")
     end
   end
+
+  private
+
+  def new_proposal_path(feature)
+    Decidim::EngineRouter.main_proxy(feature).new_proposal_path(current_feature.id)
+  end
 end

data/decidim-results/app/assets/images/decidim/results/icon.svg

@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 35 35"><path d="M17.5 35A17.5 17.5 0 1 1 35 17.5 17.52 17.52 0 0 1 17.5 35zm0-33.06A15.56 15.56 0 1 0 33.06 17.5 15.57 15.57 0 0 0 17.5 1.94zM16 22.48a1 1 0 0 1-.68-.28l-4.08-4a1 1 0 0 1 1.36-1.39l3.4 3.3 8-8.8a1 1 0 0 1 1.44 1.31l-8.69 9.55a1 1 0 0 1-.69.32z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 35 35">
+  <path d="M17.5 35A17.5 17.5 0 1 1 35 17.5 17.52 17.52 0 0 1 17.5 35zm0-33.06A15.56 15.56 0 1 0 33.06 17.5 15.57 15.57 0 0 0 17.5 1.94zM16 22.48a1 1 0 0 1-.68-.28l-4.08-4a1 1 0 0 1 1.36-1.39l3.4 3.3 8-8.8a1 1 0 0 1 1.44 1.31l-8.69 9.55a1 1 0 0 1-.69.32z"/>
+</svg>

data/decidim-results/app/forms/decidim/results/admin/result_form.rb

@@ -37,7 +37,7 @@ module Decidim
         end
 
         def process_scope
-          current_feature.participatory_process.scope
+          current_feature.participatory_space.scope
         end
 
         def scope

data/decidim-results/app/models/decidim/results/result.rb

@@ -10,6 +10,7 @@ module Decidim
       include Decidim::HasScope
       include Decidim::HasCategory
       include Decidim::HasReference
+      include Decidim::Followable
       include Decidim::Comments::Commentable
 
       feature_manifest_name "results"
@@ -21,7 +22,7 @@ module Decidim
 
       # Public: Overrides the `accepts_new_comments?` Commentable concern method.
       def accepts_new_comments?
-        commentable? && !feature.active_step_settings.comments_blocked
+        commentable? && !feature.current_settings.comments_blocked
       end
 
       # Public: Overrides the `comments_have_alignment?` Commentable concern method.
@@ -34,14 +35,9 @@ module Decidim
         true
       end
 
-      # Public: Overrides the `notifiable?` Notifiable concern method.
-      def notifiable?(_context)
-        true
-      end
-
-      # Public: Overrides the `users_to_notify` Notifiable concern method.
-      def users_to_notify
-        Decidim::Admin::ProcessAdmins.for(feature.participatory_process)
+      # Public: Override Commentable concern method `users_to_notify_on_comment_created`
+      def users_to_notify_on_comment_created
+        (followers | feature.participatory_space.admins).uniq
       end
     end
   end

data/decidim-results/app/views/decidim/results/admin/results/_form.html.erb

@@ -12,14 +12,14 @@
       <%= form.translated :editor, :description %>
     </div>
 
-    <% if current_participatory_process.has_subscopes? %>
+    <% if current_participatory_space.has_subscopes? %>
       <div class="row column">
-        <%= form.scopes_select :decidim_scope_id, prompt: I18n.t("decidim.scopes.global"), remote_path: decidim.scopes_search_path(root: current_participatory_process.scope) %>
+        <%= form.scopes_select :decidim_scope_id, prompt: I18n.t("decidim.scopes.global"), remote_path: decidim.scopes_search_path(root: current_participatory_space.scope) %>
       </div>
     <% end %>
 
     <div class="row column">
-      <%= form.categories_select :decidim_category_id, current_participatory_process.categories, include_blank: true, disable_parents: false %>
+      <%= form.categories_select :decidim_category_id, current_participatory_space.categories, include_blank: true, disable_parents: false %>
     </div>
     <div class="row column">
       <% if @form.proposals %>

data/decidim-results/app/views/decidim/results/results/_filters.html.erb

@@ -12,7 +12,7 @@
     </div>
   </div>
 
-  <% if current_participatory_process.has_subscopes? %>
+  <% if current_participatory_space.has_subscopes? %>
     <%= form.scopes_select :scope_id, legend_title: t(".scopes"), label: false, prompt: t('.scope_prompt'), remote_path: decidim.scopes_search_path(include_root: true), multiple: true %>
   <% end %>
 

data/decidim-results/app/views/decidim/results/results/show.html.erb

@@ -38,6 +38,7 @@
         </div>
       </div>
     </div>
+    <%= render partial: "decidim/shared/follow_button", locals: { followable: result } %>
     <%= feature_reference(result) %>
     <%= render partial: "decidim/shared/share_modal" %>
     <%= embed_modal_for result_result_widget_url(result, format: :js) %>

data/decidim-results/config/locales/ca.yml

@@ -1,3 +1,4 @@
+---
 ca:
   activemodel:
     attributes:
@@ -13,14 +14,14 @@ ca:
         name: Resultats
         settings:
           global:
+            announcement: Avís
             comments_enabled: Comentaris habilitats
           step:
+            announcement: Avís
             comments_blocked: Comentaris bloquejats
     resource_links:
       included_proposals:
         result_proposals: Propostes incloses en aquest resultat
-      meetings_through_proposals:
-        result_meetings: Trobades relacionades
     results:
       actions:
         confirm_destroy: Segur que vols suprimir aquest resultat?

data/decidim-results/config/locales/en.yml

@@ -22,8 +22,6 @@ en:
     resource_links:
       included_proposals:
         result_proposals: Proposals included in this result
-      meetings_through_proposals:
-        result_meetings: Related meetings
     results:
       actions:
         confirm_destroy: Are you sure you want to delete this result?

data/decidim-results/config/locales/es.yml

@@ -1,3 +1,4 @@
+---
 es:
   activemodel:
     attributes:
@@ -13,17 +14,17 @@ es:
         name: Resultados
         settings:
           global:
+            announcement: Aviso
             comments_enabled: Comentarios habilitados
           step:
+            announcement: Aviso
             comments_blocked: Comentarios bloqueados
     resource_links:
       included_proposals:
         result_proposals: Propuestas incluidas en este resultado
-      meetings_through_proposals:
-        result_meetings: Encuentros relacionados
     results:
       actions:
-        confirm_destroy: '¿Está seguro de que quiere eliminar este resultado?'
+        confirm_destroy: "¿Está seguro de que quiere eliminar este resultado?"
         destroy: Borrar
         edit: Editar
         new: Nuevo

data/decidim-results/config/locales/eu.yml

@@ -6,21 +6,21 @@ eu:
         decidim_scope_id: Esparrua
         description: Deskribapena
         proposal_ids: Sartutako proposamenak
-        title: Izenburua
+        title: Titulua
   decidim:
     features:
       results:
         name: Emaitzak
         settings:
           global:
+            announcement: Oharra
             comments_enabled: Iruzkinak gaituta
           step:
+            announcement: Oharra
             comments_blocked: Iruzkinak blokeatuta
     resource_links:
       included_proposals:
         result_proposals: Emaitza honetan jasotako proposamenak
-      meetings_through_proposals:
-        result_meetings: Proposamenarekin lotutako topaketak
     results:
       actions:
         confirm_destroy: Ziur zaude emaitza hau ezabatu nahi duzula?
@@ -53,7 +53,7 @@ eu:
       models:
         result:
           fields:
-            title: Izenburua
+            title: Titulua
       results:
         count:
           results_count:
@@ -62,6 +62,7 @@ eu:
         filters:
           category: Kategoria
           category_prompt: Aukeratu kategoria bat
+          scope_prompt: Hautatu esparrua
           scopes: Esparruak
           search: Bilatu
         filters_small_view: