decidim 0.0.4 → 0.0.5

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

@@ -10,9 +10,7 @@
           <div class="card card--nomargin text-center">
             <div class="card__content">
               <span class="definition-data__title"><%= t('.vote_limit.left', limit: feature_settings.vote_limit) %></span>
-              <span id="remaining-votes-count" class="extra__suport-number">
-                <%= render partial: "remaining_votes_count" %>
-              </span>
+              <%= render partial: "remaining_votes_count" %>
               <span class="extra__suport-text"><%= t('.vote_limit.votes') %></span>
             </div>
           </div>

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

@@ -1,7 +1,3 @@
-<% add_meta_tags({
-  title: t(".meta_title", feature_name: translated_attribute(current_feature.name))
-}) %>
-
 <%= render partial: "votes_limit" %>
 <div class="row columns">
   <div class="title-action">

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

@@ -24,7 +24,7 @@
             </div>
           <% end %>
 
-          <% if @form.scopes&.any? %>
+          <% if @form.scopes&.any? && feature_settings.scoped_proposals_enabled %>
             <div class="field">
               <%= form.select :scope_id, @form.scopes.map{|s| [s.name, s.id]}, prompt: t(".select_a_scope") %>
             </div>

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

@@ -1,4 +1,4 @@
-<% add_meta_tags({
+<% add_decidim_meta_tags({
   description: @proposal.body,
   title: @proposal.title,
   url: proposal_url(@proposal.id)
@@ -66,11 +66,7 @@
   </div>
 </div>
 
-<%= content_for :expanded do %>
-  <% if feature_settings.comments_always_enabled || current_settings.comments_enabled %>
-    <%= comments_for @proposal, arguable: true, votable: true %>
-  <% end %>
-<% end %>
+<%= comments_for @proposal %>
 
 <%= javascript_include_tag "decidim/proposals/social_share" %>
 <%= stylesheet_link_tag "decidim/proposals/social_share" %>

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

@@ -15,8 +15,16 @@ ca:
           vote: Votar
         name: Propostes
         settings:
+          global:
+            comments_enabled: Comentaris habilitats
+            official_proposals_enabled: Propostes oficials habilitades
+            proposal_answering_enabled: Resposta oficial a propostes activades
+            scoped_proposals_enabled: Propostes amb àmbits
+            vote_limit: Límit de vot
           step:
+            comments_blocked: Comentaris bloquejats
             creation_enabled: Habilitar de creació de propostes
+            proposal_answering_enabled: Resposta oficial a propostes activades
             votes_blocked: Suports bloquejats
             votes_enabled: Suports habilitats
     proposals:
@@ -89,7 +97,6 @@ ca:
           filter_for: Filtrar per
           unfold: Desplegar
         index:
-          meta_title: "%{feature_name}"
           new_proposal: Nova proposta
         linked_proposals:
           proposal_votes:

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

@@ -16,8 +16,16 @@ en:
           vote: Vote
         name: Proposals
         settings:
+          global:
+            comments_enabled: Comments enabled
+            official_proposals_enabled: Official proposals enabled
+            proposal_answering_enabled: Proposal answering enabled
+            scoped_proposals_enabled: Scoped proposals enabled
+            vote_limit: Vote limit
           step:
+            comments_blocked: Comments blocked
             creation_enabled: Proposal creation enabled
+            proposal_answering_enabled: Proposal answering enabled
             votes_blocked: Votes blocked
             votes_enabled: Votes enabled
     proposals:
@@ -90,7 +98,6 @@ en:
           filter_for: Filter by
           unfold: Unfold
         index:
-          meta_title: "%{feature_name}"
           new_proposal: New proposal
         linked_proposals:
           proposal_votes:

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

@@ -15,8 +15,16 @@ es:
           vote: Votar
         name: Propuestas
         settings:
+          global:
+            comments_enabled: Comentarios habilitados
+            official_proposals_enabled: Propuestas oficiales habilitadas
+            proposal_answering_enabled: Respuesta oficial a propuestas habilitadas
+            scoped_proposals_enabled: Propuestas con ámbito
+            vote_limit: Límite de votos
           step:
+            comments_blocked: Comentarios bloqueados
             creation_enabled: Habilitar creación de propuestas
+            proposal_answering_enabled: Respuesta a propuestas activadas
             votes_blocked: Votación bloqueada
             votes_enabled: Votos habilitados
     proposals:
@@ -89,7 +97,6 @@ es:
           filter_for: Filtrar por
           unfold: Desplegar
         index:
-          meta_title: "%{feature_name}"
           new_proposal: Nueva propuesta
         linked_proposals:
           proposal_votes:

data/decidim-proposals/lib/decidim/proposals/admin_engine.rb

@@ -14,6 +14,13 @@ module Decidim
         root to: "proposals#index"
       end
 
+      initializer "decidim_proposals.inject_abilities_to_user" do |_app|
+        Decidim.configure do |config|
+          config.admin_abilities += ["Decidim::Proposals::Abilities::AdminUser"]
+          config.admin_abilities += ["Decidim::Proposals::Abilities::ProcessAdminUser"]
+        end
+      end
+
       def load_seed
         nil
       end

data/decidim-proposals/lib/decidim/proposals/feature.rb

@@ -17,14 +17,18 @@ Decidim.register_feature(:proposals) do |feature|
 
   feature.settings(:global) do |settings|
     settings.attribute :vote_limit, type: :integer, default: 0
-    settings.attribute :comments_always_enabled, type: :boolean, default: true
+    settings.attribute :proposal_answering_enabled, type: :boolean, default: true
+    settings.attribute :official_proposals_enabled, type: :boolean, default: true
+    settings.attribute :scoped_proposals_enabled, type: :boolean, default: true
+    settings.attribute :comments_enabled, type: :boolean, default: true
   end
 
   feature.settings(:step) do |settings|
     settings.attribute :votes_enabled, type: :boolean
     settings.attribute :votes_blocked, type: :boolean
-    settings.attribute :comments_enabled, type: :boolean, default: true
+    settings.attribute :comments_blocked, type: :boolean, default: false
     settings.attribute :creation_enabled, type: :boolean
+    settings.attribute :proposal_answering_enabled, type: :boolean, default: true
   end
 
   feature.register_resource do |resource|

data/decidim-proposals/spec/features/proposals_spec.rb

@@ -10,15 +10,10 @@ describe "Proposals", type: :feature do
   let!(:scope) { create :scope, organization: organization }
   let!(:user) { create :user, :confirmed, organization: organization }
 
-  before do
-    visit_feature
-  end
-
   context "creating a new proposal" do
     context "when the user is logged in" do
       before do
         login_as user, scope: :user
-        visit_feature
       end
 
       context "with creation enabled" do
@@ -29,7 +24,41 @@ describe "Proposals", type: :feature do
                  participatory_process: participatory_process)
         end
 
+        context "when scoped_proposals setting is enabled" do
+          before do
+            feature.update_attributes(settings: { scoped_proposals_enabled: true})
+          end
+
+          it "cannot be related to a scope" do
+            visit_feature
+
+            click_link "New proposal"
+
+            within "form.new_proposal" do
+              expect(page).to have_content(/Scope/i)
+            end
+          end
+        end
+
+        context "when scoped_proposals setting is not enabled" do
+          before do
+            feature.update_attributes(settings: { scoped_proposals_enabled: false})
+          end
+
+          it "cannot be related to a scope" do
+            visit_feature
+
+            click_link "New proposal"
+
+            within "form.new_proposal" do
+              expect(page).not_to have_content("Scope")
+            end
+          end
+        end
+
         it "creates a new proposal" do
+          visit_feature
+
           click_link "New proposal"
 
           within ".new_proposal" do
@@ -57,6 +86,8 @@ describe "Proposals", type: :feature do
           end
 
           it "creates a new proposal as a user group" do
+            visit_feature
+
             click_link "New proposal"
 
             within ".new_proposal" do
@@ -81,10 +112,10 @@ describe "Proposals", type: :feature do
         context "when the user isn't authorized" do
           before do
             feature.update_attribute(:permissions, create: { authorization_handler_name: "decidim/dummy_authorization_handler" })
-            visit_feature
           end
 
           it "should show a modal dialog" do
+            visit_feature
             click_link "New proposal"
             expect(page).to have_content("Authorization required")
           end
@@ -93,6 +124,7 @@ describe "Proposals", type: :feature do
 
       context "when creation is not enabled" do
         it "does not show the creation button" do
+          visit_feature
           expect(page).to have_no_link("New proposal")
         end
       end
@@ -103,6 +135,8 @@ describe "Proposals", type: :feature do
     it "allows viewing a single proposal" do
       proposal = proposals.first
 
+      visit_feature
+
       click_link proposal.title
 
       expect(page).to have_content(proposal.title)
@@ -110,6 +144,34 @@ describe "Proposals", type: :feature do
       expect(page).to have_content(proposal.author.name)
     end
 
+    context "when scoped_proposals setting is enabled" do
+      let!(:proposal) { create(:proposal, feature: feature, scope: scope) }
+
+      before do
+        feature.update_attributes(settings: { scoped_proposals_enabled: true } )
+      end
+
+      it "can be filtered by scope" do
+        visit_feature
+        click_link proposal.title
+        expect(page).to have_content(scope.name)
+      end
+    end
+
+    context "when scoped_proposals setting is not enabled" do
+      let!(:proposal) { create(:proposal, feature: feature, scope: scope) }
+
+      before do
+        feature.update_attributes(settings: { scoped_proposals_enabled: false } )
+      end
+
+      it "cannot be filtered by scope" do
+        visit_feature
+        click_link proposal.title
+        expect(page).not_to have_content(scope.name)
+      end
+    end
+
     context "when it is an official proposal" do
       let!(:official_proposal) { create(:proposal, feature: feature, author: nil) }
 
@@ -231,82 +293,206 @@ describe "Proposals", type: :feature do
 
   context "listing proposals in a participatory process" do
     it "lists all the proposals" do
+      visit_feature
       expect(page).to have_css(".card--proposal", count: 3)
     end
 
     context "when there are a lot of proposals" do
       before do
         create_list(:proposal, 17, feature: feature)
-        visit_feature
       end
 
       it "paginates them" do
+        visit_feature
+
         expect(page).to have_css(".card--proposal", count: 12)
 
         find(".pagination-next a").click
 
+        within ".pagination .current" do
+          expect(page).to have_content("2")
+        end
+
         expect(page).to have_css(".card--proposal", count: 8)
       end
     end
 
     context "when filtering" do
-      context "by origin 'official'" do
-        it "lists the filtered proposals" do
-          create(:proposal, :official, feature: feature, scope: scope)
+      context "when official_proposals setting is enabled" do
+        before do
+          feature.update_attributes(settings: { official_proposals_enabled: true})
+        end
+
+        it "can be filtered by origin" do
           visit_feature
 
-          within ".filters" do
-            choose "Official"
+          within "form.new_filter" do
+            expect(page).to have_content(/Origin/i)
           end
-
-          expect(page).to have_css(".card--proposal", count: 1)
-          expect(page).to have_content("1 PROPOSAL")
         end
-      end
 
-      context "by origin 'citizenship'" do
-        it "lists the filtered proposals" do
-          within ".filters" do
-            choose "Citizenship"
+        context "by origin 'official'" do
+          it "lists the filtered proposals" do
+            create(:proposal, :official, feature: feature, scope: scope)
+            visit_feature
+
+            within ".filters" do
+              choose "Official"
+            end
+
+            expect(page).to have_css(".card--proposal", count: 1)
+            expect(page).to have_content("1 PROPOSAL")
           end
+        end
+
+        context "by origin 'citizenship'" do
+          it "lists the filtered proposals" do
+            visit_feature
+
+            within ".filters" do
+              choose "Citizenship"
+            end
 
-          expect(page).to have_css(".card--proposal", count: proposals.size)
-          expect(page).to have_content("#{proposals.size} PROPOSALS")
+            expect(page).to have_css(".card--proposal", count: proposals.size)
+            expect(page).to have_content("#{proposals.size} PROPOSALS")
+          end
         end
       end
 
-      context "by accepted" do
-        it "lists the filtered proposals" do
-          create(:proposal, :accepted, feature: feature, scope: scope)
+      context "when official_proposals setting is not enabled" do
+        before do
+          feature.update_attributes(settings: { official_proposals_enabled: false } )
+        end
+
+        it "cannot be filtered by origin" do
           visit_feature
 
-          within ".filters" do
-            choose "Accepted"
+          within "form.new_filter" do
+            expect(page).not_to have_content(/Origin/i)
           end
+        end
+      end
 
-          expect(page).to have_css(".card--proposal", count: 1)
-          expect(page).to have_content("1 PROPOSAL")
+      context "when scoped_proposals setting is enabled" do
+        before do
+          feature.update_attributes(settings: { scoped_proposals_enabled: true } )
+        end
+
+        it "cannot be filtered by scope" do
+          visit_feature
 
-          within ".card--proposal" do
-            expect(page).to have_content("Accepted")
+          within "form.new_filter" do
+            expect(page).to have_content(/Scopes/i)
           end
         end
       end
 
-      context "by rejected" do
-        it "lists the filtered proposals" do
-          create(:proposal, :rejected, feature: feature, scope: scope)
+      context "when scoped_proposals setting is not enabled" do
+        before do
+          feature.update_attributes(settings: { scoped_proposals_enabled: false } )
+        end
+
+        it "cannot be filtered by scope" do
           visit_feature
 
-          within ".filters" do
-            choose "Rejected"
+          within "form.new_filter" do
+            expect(page).not_to have_content(/Scopes/i)
+          end
+        end
+      end
+
+      context "when proposal_answering feature setting is enabled" do
+        before do
+          feature.update_attributes(settings: { proposal_answering_enabled: true } )
+        end
+
+        context "when proposal_answering step setting is enabled" do
+          before do
+            feature.update_attributes(
+              step_settings: {
+                feature.participatory_process.active_step.id => {
+                  proposal_answering_enabled: true
+                }
+              }
+            )
+          end
+
+          it "can be filtered by state" do
+            visit_feature
+
+            within "form.new_filter" do
+              expect(page).to have_content(/State/i)
+            end
+          end
+
+          context "by accepted" do
+            it "lists the filtered proposals" do
+              create(:proposal, :accepted, feature: feature, scope: scope)
+              visit_feature
+
+              within ".filters" do
+                choose "Accepted"
+              end
+
+              expect(page).to have_css(".card--proposal", count: 1)
+              expect(page).to have_content("1 PROPOSAL")
+
+              within ".card--proposal" do
+                expect(page).to have_content("Accepted")
+              end
+            end
           end
 
-          expect(page).to have_css(".card--proposal", count: 1)
-          expect(page).to have_content("1 PROPOSAL")
+          context "by rejected" do
+            it "lists the filtered proposals" do
+              create(:proposal, :rejected, feature: feature, scope: scope)
+              visit_feature
+
+              within ".filters" do
+                choose "Rejected"
+              end
+
+              expect(page).to have_css(".card--proposal", count: 1)
+              expect(page).to have_content("1 PROPOSAL")
+
+              within ".card--proposal" do
+                expect(page).to have_content("Rejected")
+              end
+            end
+          end
+        end
+
+        context "when proposal_answering step setting is disabled" do
+          before do
+            feature.update_attributes(
+              step_settings: {
+                feature.participatory_process.active_step.id => {
+                  proposal_answering_enabled: false
+                }
+              }
+            )
+          end
+
+          it "cannot be filtered by state" do
+            visit_feature
+
+            within "form.new_filter" do
+              expect(page).not_to have_content(/State/i)
+            end
+          end
+        end
+      end
+
+      context "when proposal_answering feature setting is not enabled" do
+        before do
+          feature.update_attributes(settings: { proposal_answering_enabled: false } )
+        end
+
+        it "cannot be filtered by state" do
+          visit_feature
 
-          within ".card--proposal" do
-            expect(page).to have_content("Rejected")
+          within "form.new_filter" do
+            expect(page).not_to have_content(/State/i)
           end
         end
       end