decidim 0.5.1 → 0.6.0

data/{decidim-core/spec/queries/decidim → decidim-participatory_processes/spec/queries}/organization_participatory_process_groups_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Decidim::OrganizationParticipatoryProcessGroups do
+describe Decidim::ParticipatoryProcesses::OrganizationParticipatoryProcessGroups do
   subject { described_class.new(organization) }
 
   let!(:organization) { create(:organization) }

data/{decidim-core/spec/queries/decidim → decidim-participatory_processes/spec/queries}/organization_participatory_processes_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Decidim::OrganizationParticipatoryProcesses do
+describe Decidim::ParticipatoryProcesses::OrganizationParticipatoryProcesses do
   subject { described_class.new(organization) }
 
   let!(:organization) { create(:organization) }

data/{decidim-core/spec/queries/decidim → decidim-participatory_processes/spec/queries}/organization_prioritized_participatory_processes_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Decidim::OrganizationPrioritizedParticipatoryProcesses do
+describe Decidim::ParticipatoryProcesses::OrganizationPrioritizedParticipatoryProcesses do
   subject { described_class.new(organization) }
 
   let!(:organization) { create(:organization) }

data/{decidim-core/spec/queries/decidim → decidim-participatory_processes/spec/queries}/organization_published_participatory_processes_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Decidim::OrganizationPublishedParticipatoryProcesses do
+describe Decidim::ParticipatoryProcesses::OrganizationPublishedParticipatoryProcesses do
   subject { described_class.new(organization) }
 
   let!(:organization) { create(:organization) }

data/{decidim-admin → decidim-participatory_processes}/spec/shared/manage_process_admins_examples.rb

@@ -14,7 +14,7 @@ shared_examples "manage process admins examples" do
   before do
     switch_to_host(organization.host)
     login_as user, scope: :user
-    visit decidim_admin.edit_participatory_process_path(participatory_process)
+    visit decidim_admin_participatory_processes.edit_participatory_process_path(participatory_process)
     click_link "Process users"
   end
 
@@ -89,10 +89,18 @@ shared_examples "manage process admins examples" do
 
     context "when the user has not accepted the invitation" do
       before do
-        form = Decidim::Admin::ParticipatoryProcessUserRoleForm.from_params(name: "test",
-                                                                            email: "test@example.org",
-                                                                            role: "admin")
-        Decidim::Admin::CreateParticipatoryProcessAdmin.call(form, user, participatory_process)
+        form = Decidim::ParticipatoryProcesses::Admin::ParticipatoryProcessUserRoleForm.from_params(
+          name: "test",
+          email: "test@example.org",
+          role: "admin"
+        )
+
+        Decidim::ParticipatoryProcesses::Admin::CreateParticipatoryProcessAdmin.call(
+          form,
+          user,
+          participatory_process
+        )
+
         visit current_path
       end
 

data/{decidim-admin → decidim-participatory_processes}/spec/shared/manage_process_attachments_examples.rb

@@ -8,7 +8,7 @@ shared_examples "manage process attachments examples" do
   before do
     switch_to_host(organization.host)
     login_as user, scope: :user
-    visit decidim_admin.edit_participatory_process_path(participatory_process)
+    visit decidim_admin_participatory_processes.edit_participatory_process_path(participatory_process)
     click_link "Attachments"
   end
 

data/{decidim-admin → decidim-participatory_processes}/spec/shared/manage_process_categories_examples.rb

@@ -4,14 +4,14 @@ shared_examples "manage process categories examples" do
   before do
     switch_to_host(organization.host)
     login_as user, scope: :user
-    visit decidim_admin.edit_participatory_process_path(participatory_process)
+    visit decidim_admin_participatory_processes.edit_participatory_process_path(participatory_process)
     click_link "Categories"
   end
 
   it "creates a new category" do
     find(".card-title a.new").click
 
-    within ".new_participatory_process_category" do
+    within ".new_category" do
       fill_in_i18n(
         :category_name,
         "#category-name-tabs",
@@ -46,7 +46,7 @@ shared_examples "manage process categories examples" do
       end
     end
 
-    within ".edit_participatory_process_category" do
+    within ".edit_category" do
       fill_in_i18n(
         :category_name,
         "#category-name-tabs",
@@ -68,7 +68,7 @@ shared_examples "manage process categories examples" do
   end
 
   context "deleting a category" do
-    let!(:category2) { create(:category, participatory_process: participatory_process) }
+    let!(:category2) { create(:category, participatory_space: participatory_process) }
 
     context "when the category has no associated content" do
       context "when the category has no subcategories" do
@@ -115,7 +115,7 @@ shared_examples "manage process categories examples" do
     end
 
     context "when the category has associated content" do
-      let!(:feature) { create(:feature, participatory_process: participatory_process) }
+      let!(:feature) { create(:feature, participatory_space: participatory_process) }
       let!(:dummy_resource) { create(:dummy_resource, feature: feature, category: category) }
 
       it "cannot delete it" do

data/{decidim-admin → decidim-participatory_processes}/spec/shared/manage_process_steps_examples.rb

@@ -13,7 +13,7 @@ shared_examples "manage process steps examples" do
   before do
     switch_to_host(organization.host)
     login_as user, scope: :user
-    visit decidim_admin.edit_participatory_process_path(participatory_process)
+    visit decidim_admin_participatory_processes.edit_participatory_process_path(participatory_process)
     click_link "Steps"
   end
 

data/{decidim-admin → decidim-participatory_processes}/spec/shared/manage_processes_examples.rb

@@ -23,7 +23,7 @@ shared_examples "manage processes examples" do
           page.find("a.action-icon--preview").click
         end
 
-        expect(current_path).to eq decidim.participatory_process_path(participatory_process)
+        expect(current_path).to eq decidim_participatory_processes.participatory_process_path(participatory_process)
         expect(page).to have_content(translated(participatory_process.title))
       end
     end
@@ -31,7 +31,7 @@ shared_examples "manage processes examples" do
 
   context "viewing a missing process" do
     it_behaves_like "a 404 page" do
-      let(:target_path) { decidim_admin.participatory_process_path(99_999_999) }
+      let(:target_path) { decidim_admin_participatory_processes.participatory_process_path(99_999_999) }
     end
   end
 
@@ -80,7 +80,7 @@ shared_examples "manage processes examples" do
       click_link "Publish"
       expect(page).to have_content("published successfully")
       expect(page).to have_content("Unpublish")
-      expect(current_path).to eq decidim_admin.edit_participatory_process_path(participatory_process)
+      expect(current_path).to eq decidim_admin_participatory_processes.edit_participatory_process_path(participatory_process)
 
       participatory_process.reload
       expect(participatory_process).to be_published
@@ -98,7 +98,7 @@ shared_examples "manage processes examples" do
       click_link "Unpublish"
       expect(page).to have_content("unpublished successfully")
       expect(page).to have_content("Publish")
-      expect(current_path).to eq decidim_admin.edit_participatory_process_path(participatory_process)
+      expect(current_path).to eq decidim_admin_participatory_processes.edit_participatory_process_path(participatory_process)
 
       participatory_process.reload
       expect(participatory_process).not_to be_published
@@ -109,7 +109,7 @@ shared_examples "manage processes examples" do
     let!(:external_participatory_process) { create(:participatory_process) }
 
     before do
-      visit decidim_admin.participatory_processes_path
+      visit decidim_admin_participatory_processes.participatory_processes_path
     end
 
     it "doesn't let the admin manage processes form other organizations" do

data/decidim-participatory_processes/spec/spec_helper.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require "decidim/dev"
+
+ENV["ENGINE_NAME"] = File.dirname(__dir__).split("/").last
+
+Decidim::Dev.dummy_app_path = File.expand_path(File.join("..", "spec", "decidim_dummy_app"))
+
+require "decidim/dev/test/base_spec_helper"

data/decidim-proposals/app/assets/images/decidim/proposals/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.94zm9.5 13.7H8a1 1 0 0 1 0-1.94h19a1 1 0 0 1 0 1.94zm0 3.68H8a1 1 0 0 1 0-1.94h19a1 1 0 0 1 0 1.94zM22.26 23H8a1 1 0 0 1 0-1.94h14.26a1 1 0 0 1 0 1.94z"/></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.94zm9.5 13.7H8a1 1 0 0 1 0-1.94h19a1 1 0 0 1 0 1.94zm0 3.68H8a1 1 0 0 1 0-1.94h19a1 1 0 0 1 0 1.94zM22.26 23H8a1 1 0 0 1 0-1.94h14.26a1 1 0 0 1 0 1.94z"/>
+</svg>

data/decidim-proposals/app/forms/decidim/proposals/admin/proposal_form.rb

@@ -34,7 +34,7 @@ module Decidim
         end
 
         def process_scope
-          current_feature.participatory_process.scope
+          current_feature.participatory_space.scope
         end
 
         alias feature current_feature

data/decidim-proposals/app/forms/decidim/proposals/proposal_form.rb

@@ -38,7 +38,7 @@ module Decidim
       end
 
       def process_scope
-        current_feature.participatory_process.scope
+        current_feature.participatory_space.scope
       end
 
       alias feature current_feature

data/decidim-proposals/app/models/decidim/proposals/abilities/participatory_process_admin_ability.rb

@@ -10,7 +10,7 @@ module Decidim
           super
 
           can [:manage, :unreport, :hide], Proposal do |proposal|
-            can_manage_process?(proposal.feature.participatory_process)
+            can_manage_process?(proposal.feature.participatory_space)
           end
 
           cannot :create, Proposal unless can_create_proposal?
@@ -34,7 +34,7 @@ module Decidim
         def can_create_proposal?
           current_settings.try(:creation_enabled?) &&
             feature_settings.try(:official_proposals_enabled) &&
-            can_manage_process?(current_feature.try(:participatory_process))
+            can_manage_process?(current_feature.try(:participatory_space))
         end
 
         def can_update_proposal?

data/decidim-proposals/app/models/decidim/proposals/abilities/participatory_process_moderator_ability.rb

@@ -10,7 +10,7 @@ module Decidim
           super
 
           can [:unreport, :hide], Proposal do |proposal|
-            can_manage_process?(proposal.feature.participatory_process)
+            can_manage_process?(proposal.feature.participatory_space)
           end
         end
       end

data/decidim-proposals/app/models/decidim/proposals/proposal.rb

@@ -12,6 +12,7 @@ module Decidim
       include Decidim::HasCategory
       include Decidim::Reportable
       include Decidim::HasAttachments
+      include Decidim::Followable
       include Decidim::Comments::Commentable
 
       feature_manifest_name "proposals"
@@ -84,7 +85,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.
@@ -97,6 +98,12 @@ module Decidim
         true
       end
 
+      # Public: Override Commentable concern method `users_to_notify_on_comment_created`
+      def users_to_notify_on_comment_created
+        return (followers | feature.participatory_space.admins).uniq if official?
+        followers
+      end
+
       # Public: Overrides the `reported_content_url` Reportable concern method.
       def reported_content_url
         ResourceLocatorPresenter.new(self).url
@@ -106,20 +113,6 @@ module Decidim
       def official?
         author.nil?
       end
-
-      # Public: Overrides the `notifiable?` Notifiable concern method.
-      # When a proposal is commented the proposal's author is notified if it is not the same
-      # who has commented the proposal and if the proposal's author has comment notifications enabled.
-      def notifiable?(context)
-        return true if official?
-        context[:author] != author && author.comments_notifications?
-      end
-
-      # Public: Overrides the `users_to_notify` Notifiable concern method.
-      def users_to_notify
-        return Decidim::Admin::ProcessAdmins.for(feature.participatory_process) if official?
-        [author]
-      end
     end
   end
 end

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

@@ -24,9 +24,9 @@
       </div>
     <% end %>
 
-    <% if current_participatory_process.has_subscopes? %>
+    <% if current_participatory_space.has_subscopes? %>
       <div class="row column">
-        <%= form.scopes_select :scope_id, prompt: I18n.t("decidim.scopes.global"), remote_path: decidim.scopes_search_path(root: current_participatory_process.scope) %>
+        <%= form.scopes_select :scope_id, prompt: I18n.t("decidim.scopes.global"), remote_path: decidim.scopes_search_path(root: current_participatory_space.scope) %>
       </div>
     <% end %>
 

data/decidim-proposals/app/views/decidim/proposals/admin/proposals/index.html.erb

@@ -5,7 +5,7 @@
 
       <div class="button--title">
 
-        <% if feature_settings.official_proposals_enabled %>
+        <% if can? :create, Decidim::Proposals::Proposal %>
           <%= link_to t("actions.new", scope: "decidim.proposals", name: t("models.proposal.name", scope: "decidim.proposals.admin")), new_proposal_path, class: 'button tiny button--simple' if can? :manage, current_feature %>
         <% end %>
 
@@ -19,9 +19,10 @@
       <table class="table-list">
         <thead>
           <tr>
+            <th><%= t("models.proposal.fields.id", scope: "decidim.proposals") %></th>
             <th><%= t("models.proposal.fields.title", scope: "decidim.proposals") %></th>
             <th><%= t("models.proposal.fields.category", scope: "decidim.proposals") %></th>
-            <% if scopes_enabled?(current_participatory_process) %>
+            <% if scopes_enabled?(current_participatory_space) %>
               <th><%= t("models.proposal.fields.scope", scope: "decidim.proposals") %></th>
             <% end %>
             <th><%= t("models.proposal.fields.state", scope: "decidim.proposals") %></th>
@@ -31,6 +32,9 @@
         <tbody>
           <% proposals.each do |proposal| %>
             <tr data-id="<%= proposal.id %>">
+              <td>
+                <%= proposal.id %><br />
+              </td>
               <td>
                 <%= proposal.title %><br />
               </td>
@@ -39,7 +43,7 @@
                   <%= translated_attribute proposal.category.name %>
                 <% end %>
               </td>
-              <% if scopes_enabled?(current_participatory_process) %>
+              <% if scopes_enabled?(current_participatory_space) %>
                 <td>
                   <% if proposal.scope %>
                     <%= translated_attribute proposal.scope.name %>

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

@@ -28,8 +28,8 @@
     <%= form.collection_check_boxes :activity, [["voted", t('.voted')]], :first, :last, legend_title: t('.activity') %>
   <% end %>
 
-  <% if current_participatory_process.has_subscopes? %>
-    <%= form.scopes_select :scope_id, legend_title: t(".scopes"), label: false, prompt: t('.scope_prompt'), remote_path: decidim.scopes_search_path(root: current_participatory_process.scope, include_root: true), multiple: true %>
+  <% 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(root: current_participatory_space.scope, include_root: true), multiple: true %>
   <% end %>
 
   <% if current_feature.categories.any? %>

data/decidim-proposals/app/views/decidim/proposals/proposals/new.html.erb

@@ -38,9 +38,9 @@
             </div>
           <% end %>
 
-          <% if current_participatory_process.has_subscopes? %>
+          <% if current_participatory_space.has_subscopes? %>
             <div class="field">
-              <%= form.scopes_select :scope_id, prompt: I18n.t("decidim.scopes.global"), remote_path: decidim.scopes_search_path(root: current_participatory_process.scope) %>
+              <%= form.scopes_select :scope_id, prompt: I18n.t("decidim.scopes.global"), remote_path: decidim.scopes_search_path(root: current_participatory_space.scope) %>
             </div>
           <% end %>
 

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

@@ -18,11 +18,12 @@
 </div>
 <div class="row">
   <div class="columns section view-side mediumlarge-4 mediumlarge-push-8 large-3 large-push-9">
-    <% if current_settings.votes_enabled? %>
+    <% if current_settings.votes_enabled? || current_user %>
       <div class="card extra">
         <div class="card__content">
           <%= render partial: "votes_count", locals: { proposal: @proposal, from_proposals_list: false } %>
           <%= render partial: "vote_button", locals: { proposal: @proposal, from_proposals_list: false } %>
+          <%= render partial: "decidim/shared/follow_button", locals: { followable: @proposal } %>
         </div>
       </div>
     <% end %>

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

@@ -1,3 +1,4 @@
+---
 ca:
   activemodel:
     attributes:
@@ -18,12 +19,16 @@ ca:
         name: Propostes
         settings:
           global:
+            announcement: Avís
+            attachments_allowed: Permetre arxius adjunts
             comments_enabled: Comentaris habilitats
             geocoding_enabled: Geocodificació habilitada
+            new_proposal_help_text: Text d'ajuda al crear una nova proposta
             official_proposals_enabled: Propostes oficials habilitades
             proposal_answering_enabled: Resposta oficial a propostes activades
             vote_limit: Límit de vot
           step:
+            announcement: Avís
             comments_blocked: Comentaris bloquejats
             creation_enabled: Habilitar de creació de propostes
             proposal_answering_enabled: Resposta oficial a propostes activades
@@ -59,6 +64,7 @@ ca:
             invalid: Hi ha hagut un problema en crear aquesta proposta
             success: Proposta creada correctament
           form:
+            attachment_legend: "(Opcional) Afegiu un fitxer adjunt"
             select_a_category: Selecciona una categoria
           index:
             title: Propostes
@@ -77,6 +83,7 @@ ca:
         proposal:
           fields:
             category: Categoria
+            id: ID
             official_proposal: Proposta oficial
             scope: Àmbit
             state: Estat
@@ -122,6 +129,7 @@ ca:
             one: <span class="card--list__data__number">1</span>suport
             other: <span class="card--list__data__number">%{count}</span>suports
         new:
+          attachment_legend: "(Opcional) Afegiu un fitxer adjunt"
           back: Enrere
           select_a_category: Si us plau, seleccioni una categoria
           send: Enviar
@@ -156,5 +164,3 @@ ca:
       included_proposals:
         proposal_projects: 'Proposta formulada en aquests projectes:'
         proposal_results: 'La proposta apareix en aquests resultats:'
-      proposals_from_meeting:
-        proposal_meetings: Trobades relacionades