decidim 0.0.4 → 0.0.5

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

@@ -6,9 +6,9 @@ en:
         name: Page
         settings:
           global:
-            comments_always_enabled: Comments always enabled
-          step:
             comments_enabled: Comments enabled
+          step:
+            comments_blocked: Comments blocked
     pages:
       admin:
         models:

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

@@ -5,9 +5,9 @@ es:
         name: Página
         settings:
           global:
-            comments_always_enabled: Comentarios siempre habilitados
-          step:
             comments_enabled: Comentarios habilitados
+          step:
+            comments_blocked: Comentarios bloqueados
     pages:
       admin:
         models:

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

@@ -20,11 +20,11 @@ Decidim.register_feature(:pages) do |feature|
   end
 
   feature.settings(:global) do |settings|
-    settings.attribute :comments_always_enabled, type: :boolean
+    settings.attribute :comments_enabled, type: :boolean, default: true
   end
 
   feature.settings(:step) do |settings|
-    settings.attribute :comments_enabled, type: :boolean
+    settings.attribute :comments_blocked, type: :boolean, default: false
   end
 
   feature.seeds do

data/decidim-pages/spec/features/page_show_spec.rb

@@ -34,37 +34,4 @@ describe "Show a page", type: :feature do
       expect(page).to have_content("Content")
     end
   end
-
-  describe "page show with comments" do
-    let!(:comments) { create_list(:comment, 3, commentable: page_feature) }
-
-    context "when the page is commentable" do
-      before do
-        feature.settings = { comments_always_enabled: true }
-        feature.save
-        visit_feature
-      end
-
-      it "renders the comments of the page" do
-        expect(page).to have_selector('.comment', count: comments.length)
-
-        comments.each do |comment|
-          expect(page).to have_content comment.body
-        end
-      end
-    end
-
-    context "when the page is not commentable" do
-      before do
-        feature.settings = { comments_always_enabled: false }
-        feature.save
-        visit_feature
-      end
-
-      it "doesn't render the comments of the page" do
-        visit_feature
-        expect(page).not_to have_selector('.comment', count: comments.length)
-      end
-    end
-  end
 end

data/decidim-proposals/app/controllers/decidim/proposals/admin/proposal_answers_controller.rb

@@ -7,10 +7,12 @@ module Decidim
         helper_method :proposal
 
         def edit
+          authorize! :update, proposal
           @form = form(Admin::ProposalAnswerForm).from_model(proposal)
         end
 
         def update
+          authorize! :update, proposal
           @form = form(Admin::ProposalAnswerForm).from_params(params)
 
           Admin::AnswerProposal.call(@form, proposal) do

data/decidim-proposals/app/controllers/decidim/proposals/admin/proposals_controller.rb

@@ -8,10 +8,12 @@ module Decidim
         helper_method :proposals
 
         def new
+          authorize! :create, Proposal
           @form = form(Admin::ProposalForm).from_params({})
         end
 
         def create
+          authorize! :create, Proposal
           @form = form(Admin::ProposalForm).from_params(params)
 
           Admin::CreateProposal.call(@form) do

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

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+module Decidim
+  module Proposals
+    module Abilities
+      # Defines the abilities related to proposals for a logged in admin user.
+      # Intended to be used with `cancancan`.
+      class AdminUser
+        include CanCan::Ability
+
+        attr_reader :user, :context
+
+        def initialize(user, context)
+          return unless user && user.role?(:admin)
+
+          @user = user
+          @context = context
+
+          can :manage, Proposal
+          cannot :create, Proposal unless can_create_proposal?
+          cannot :update, Proposal unless can_update_proposal?
+        end
+
+        private
+
+        def current_settings
+          context.fetch(:current_settings, nil)
+        end
+
+        def feature_settings
+          context.fetch(:feature_settings, nil)
+        end
+
+        def can_create_proposal?
+          current_settings.try(:creation_enabled?) &&
+            feature_settings.try(:official_proposals_enabled)
+        end
+
+        def can_update_proposal?
+          current_settings.try(:proposal_answering_enabled) &&
+            feature_settings.try(:proposal_answering_enabled)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+module Decidim
+  module Proposals
+    module Abilities
+      # Defines the abilities related to proposals for a logged in process admin user.
+      # Intended to be used with `cancancan`.
+      class ProcessAdminUser
+        include CanCan::Ability
+
+        attr_reader :user, :context
+
+        def initialize(user, context)
+          return unless user && !user.role?(:admin)
+
+          @user = user
+          @context = context
+
+          can :manage, Proposal do |proposal|
+            participatory_processes.include?(proposal.feature.participatory_process)
+          end
+
+          cannot :create, Proposal unless can_create_proposal?
+          cannot :update, Proposal unless can_update_proposal?
+        end
+
+        private
+
+        def current_settings
+          context.fetch(:current_settings, nil)
+        end
+
+        def feature_settings
+          context.fetch(:feature_settings, nil)
+        end
+
+        def current_feature
+          context.fetch(:current_feature, nil)
+        end
+
+        def can_create_proposal?
+          current_settings.try(:creation_enabled?) &&
+            feature_settings.try(:official_proposals_enabled) &&
+            participatory_processes.include?(current_feature.try(:participatory_process))
+        end
+
+        def can_update_proposal?
+          current_settings.try(:proposal_answering_enabled) &&
+            feature_settings.try(:proposal_answering_enabled)
+        end
+
+        def participatory_processes
+          @participatory_processes ||= Decidim::Admin::ManageableParticipatoryProcessesForUser.for(@user)
+        end
+      end
+    end
+  end
+end

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

@@ -8,6 +8,7 @@ module Decidim
       include Decidim::HasFeature
       include Decidim::HasScope
       include Decidim::HasCategory
+      include Decidim::Comments::Commentable
 
       feature_manifest_name "proposals"
 
@@ -53,6 +54,26 @@ module Decidim
       def rejected?
         state == "rejected"
       end
+
+      # Public: Overrides the `commentable?` Commentable concern method.
+      def commentable?
+        feature.settings.comments_enabled?
+      end
+
+      # Public: Overrides the `accepts_new_comments?` Commentable concern method.
+      def accepts_new_comments?
+         commentable? && !feature.active_step_settings.comments_blocked
+      end
+
+      # Public: Overrides the `comments_have_alignment?` Commentable concern method.
+      def comments_have_alignment?
+        true
+      end
+
+      # Public: Overrides the `comments_have_votes?` Commentable concern method.
+      def comments_have_votes?
+        true
+      end
     end
   end
 end

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

@@ -12,7 +12,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/admin/proposals/index.html.erb

@@ -1,15 +1,19 @@
 <h2><%= t(".title") %></h2>
 
-<div class="actions title">
-  <%= link_to t("actions.new", scope: "decidim.proposals", name: t("models.proposal.name", scope: "decidim.proposals.admin")), new_proposal_path, class: 'new' if can? :manage, current_feature %>
-</div>
+<% if feature_settings.official_proposals_enabled %>
+  <div class="actions title">
+    <%= link_to t("actions.new", scope: "decidim.proposals", name: t("models.proposal.name", scope: "decidim.proposals.admin")), new_proposal_path, class: 'new' if can? :manage, current_feature %>
+  </div>
+<% end %>
 
 <table class="stack">
   <thead>
     <tr>
       <th><%= t("models.proposal.fields.title", scope: "decidim.proposals") %></th>
       <th><%= t("models.proposal.fields.category", scope: "decidim.proposals") %></th>
-      <th><%= t("models.proposal.fields.scope", scope: "decidim.proposals") %></th>
+      <% if feature_settings.scoped_proposals_enabled %>
+        <th><%= t("models.proposal.fields.scope", scope: "decidim.proposals") %></th>
+      <% end %>
       <th><%= t("models.proposal.fields.state", scope: "decidim.proposals") %></th>
       <th class="actions"><%= t("actions.title", scope: "decidim.proposals") %></th>
     </tr>
@@ -25,16 +29,18 @@
             <%= translated_attribute proposal.category.name %>
           <% end %>
         </td>
-        <td>
-          <% if proposal.scope %>
-            <%= translated_attribute proposal.scope.name %>
-          <% end %>
-        </td>
+        <% if feature_settings.scoped_proposals_enabled %>
+          <td>
+            <% if proposal.scope %>
+              <%= translated_attribute proposal.scope.name %>
+            <% end %>
+          </td>
+        <% end %>
         <td>
           <%= humanize_proposal_state proposal.state %>
         </td>
         <td class="actions">
-          <%= link_to t("actions.answer", scope: "decidim.proposals"), edit_proposal_proposal_answer_path(proposal_id: proposal.id, id: proposal.id) if can? :update, current_feature %>
+          <%= link_to t("actions.answer", scope: "decidim.proposals"), edit_proposal_proposal_answer_path(proposal_id: proposal.id, id: proposal.id) if can? :update, proposal %>
         </td>
       </tr>
     <% end %>

data/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');
 
-$proposalVotesCount.html('<%= j(render partial: 'decidim/proposals/proposals/votes_count', locals: { proposal: proposal, from_proposals_list: @from_proposals_list }) %>');
-$proposalVoteButton.html('<%= 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 }) %>');
+morphdom($proposalVoteButton[0], '<%= j(render partial: 'decidim/proposals/proposals/vote_button', locals: { proposal: proposal, from_proposals_list: @from_proposals_list }) %>');
 
 <% if vote_limit_enabled? %>
   var $remainingVotesCount = $('#remaining-votes-count');
   var $notVotedButtons = $('.card__button.button').not('.success');
 
-  $remainingVotesCount.html('<%= j(render partial: 'decidim/proposals/proposals/remaining_votes_count') %>');
+  morphdom($remainingVotesCount[0], '<%= j(render partial: 'decidim/proposals/proposals/remaining_votes_count') %>');
 
   <% if remaining_votes_count_for(current_user) == 0 %>
     $notVotedButtons.attr('disabled', true);
@@ -17,4 +17,4 @@ $proposalVoteButton.html('<%= j(render partial: 'decidim/proposals/proposals/vot
     $notVotedButtons.attr('disabled', false);
     $notVotedButtons.val('<%= t('decidim.proposals.proposals.vote_button.vote') %>');
   <% end %>
-<% end %>
+<% end %>

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

@@ -12,9 +12,13 @@
     </div>
   </div>
 
-  <%= form.collection_radio_buttons :origin, [["all", t('.all')], ["official", t('.official')], ["citizenship", t('.citizenship')]], :first, :last, legend_title: t('.origin') %>
+  <% if feature_settings.official_proposals_enabled %>
+    <%= form.collection_radio_buttons :origin, [["all", t('.all')], ["official", t('.official')], ["citizenship", t('.citizenship')]], :first, :last, legend_title: t('.origin') %>
+  <% end %>
 
-  <%= form.collection_radio_buttons :state, [["all", t('.all')], ["accepted", t('.accepted')], ["rejected", t('.rejected')]], :first, :last, legend_title: t('.state') %>
+  <% if feature_settings.proposal_answering_enabled && current_settings.proposal_answering_enabled %>
+    <%= form.collection_radio_buttons :state, [["all", t('.all')], ["accepted", t('.accepted')], ["rejected", t('.rejected')]], :first, :last, legend_title: t('.state') %>
+  <% end %>
 
   <% if linked_classes_for(Decidim::Proposals::Proposal).any? %>
     <%= form.collection_radio_buttons :related_to, linked_classes_filter_values_for(Decidim::Proposals::Proposal), :first, :last, legend_title: t('.related_to') %>
@@ -24,7 +28,7 @@
     <%= form.collection_check_boxes :activity, [["voted", t('.voted')]], :first, :last, legend_title: t('.activity') %>
   <% end %>
 
-  <% if current_organization.scopes.any? %>
+  <% if current_organization.scopes.any? && feature_settings.scoped_proposals_enabled %>
     <%= form.collection_check_boxes :scope_id, current_organization.scopes, lambda {|scope| scope.id.to_s}, :name, legend_title: t('.scopes') %>
   <% end %>
 

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

@@ -24,12 +24,8 @@
     <div class="card__footer">
       <div class="card__support">
         <% if current_settings.votes_enabled? %>
-          <div id="proposal-<%= proposal.id %>-votes-count" class="card__support__data">
-            <%= render partial: "votes_count", locals: { proposal: proposal, from_proposals_list: true } %>
-          </div>
-          <div id="proposal-<%= proposal.id %>-vote-button">
-            <%= render partial: "vote_button", locals: { proposal: proposal, from_proposals_list: true } %>
-          </div>
+          <%= render partial: "votes_count", locals: { proposal: proposal, from_proposals_list: true } %>
+          <%= render partial: "vote_button", locals: { proposal: proposal, from_proposals_list: true } %>
         <% elsif !current_settings.votes_enabled? || current_settings.votes_enabled? && current_settings.votes_blocked? %>
           <div class="card__support__data"></div>
           <%= link_to t(".view_proposal"), proposal, class: "card__button button small secondary" %>

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

@@ -1 +1,3 @@
-<%= remaining_votes_count_for(current_user) %>
+<span id="remaining-votes-count" class="extra__suport-number">
+  <%= remaining_votes_count_for(current_user) %>
+</span>

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

@@ -3,7 +3,7 @@
     <% if proposal.category.present? %>
       <li><%= link_to translated_attribute(proposal.category.name), decidim_proposals.proposals_path(filter: { category_id: proposal.category.id }) %></li>
     <% end %>
-    <% if proposal.scope.present? %>
+    <% if proposal.scope.present? && feature_settings.scoped_proposals_enabled %>
       <li><%= link_to proposal.scope.name, decidim_proposals.proposals_path(filter: { scope_id: [proposal.scope.id] }) %></li>
     <% end %>
   </ul>

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

@@ -1,25 +1,27 @@
-<% if !current_user %>
-  <button class="card__button button <%= vote_button_classes(from_proposals_list) %>" data-toggle="loginModal">
-    <%= t('.vote') %>
-  </button>
-<% else %>
-  <% if @voted_proposals ? @voted_proposals.include?(proposal.id) : proposal.voted_by?(current_user) %>
-    <% if vote_limit_enabled? %>
-      <%= action_authorized_button_to :vote, t('.already_voted'), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), method: :delete, remote: true, data: { disable: true }, class: "card__button button #{vote_button_classes(from_proposals_list)} success" %>
-    <% else %>
-      <button class="card__button button <%= vote_button_classes(from_proposals_list) %> success">
-        <%= t('.already_voted') %>
-      </button>
-    <% end %>
+<div id="proposal-<%= proposal.id %>-vote-button">
+  <% if !current_user %>
+    <button class="card__button button <%= vote_button_classes(from_proposals_list) %>" data-toggle="loginModal">
+      <%= t('.vote') %>
+    </button>
   <% else %>
-    <% if vote_limit_enabled? && remaining_votes_count_for(current_user) == 0 %>
-      <%= action_authorized_button_to :vote, t('.no_votes_remaining'), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), remote: true, data: { disable: true }, class: "card__button button #{vote_button_classes(from_proposals_list)}", disabled: true %>
-    <% elsif current_settings.votes_blocked? %>
-      <button class="card__button button <%= vote_button_classes(from_proposals_list) %> disabled">
-        <%= t('.votes_blocked') %>
-      </button>
+    <% if @voted_proposals ? @voted_proposals.include?(proposal.id) : proposal.voted_by?(current_user) %>
+      <% if vote_limit_enabled? %>
+        <%= action_authorized_button_to :vote, t('.already_voted'), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), method: :delete, remote: true, data: { disable: true }, class: "card__button button #{vote_button_classes(from_proposals_list)} success" %>
+      <% else %>
+        <button class="card__button button <%= vote_button_classes(from_proposals_list) %> success">
+          <%= t('.already_voted') %>
+        </button>
+      <% end %>
     <% else %>
-      <%= action_authorized_button_to "vote", t('.vote'), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), remote: true, data: { disable: true }, class: "card__button button #{vote_button_classes(from_proposals_list)}" %>
+      <% if vote_limit_enabled? && remaining_votes_count_for(current_user) == 0 %>
+        <%= action_authorized_button_to :vote, t('.no_votes_remaining'), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), remote: true, data: { disable: true }, class: "card__button button #{vote_button_classes(from_proposals_list)}", disabled: true %>
+      <% elsif current_settings.votes_blocked? %>
+        <button class="card__button button <%= vote_button_classes(from_proposals_list) %> disabled">
+          <%= t('.votes_blocked') %>
+        </button>
+      <% else %>
+        <%= action_authorized_button_to "vote", t('.vote'), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), remote: true, data: { disable: true }, class: "card__button button #{vote_button_classes(from_proposals_list)}" %>
+      <% end %>
     <% end %>
   <% end %>
-<% end %>
+</div>

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

@@ -1,6 +1,9 @@
-<span class="<%= votes_count_classes(from_proposals_list)[:number] %>">
-  <%= proposal.proposal_votes_count %>
-</span>
-<span class="<%= votes_count_classes(from_proposals_list)[:label]  %>">
-  <%= t('.count', count: proposal.proposal_votes_count) %>
-</span>
+<div id="proposal-<%= proposal.id %>-votes-count" class="card__support__data">
+  <span class="<%= votes_count_classes(from_proposals_list)[:number] %>">
+    <%= proposal.proposal_votes_count %>
+  </span>
+  <span class="<%= votes_count_classes(from_proposals_list)[:label]  %>">
+    <%= t('.count', count: proposal.proposal_votes_count) %>
+  </span>
+
+</div>