decidim-proposals 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72d9615abcde37945383d87bb3f7c74126d66b3c
-  data.tar.gz: 588e35fae074a55307aab6789d6d3af25db87d9a
+  metadata.gz: 1fa61b404c05485715f4617683618718c79f9a92
+  data.tar.gz: 3afb55cb4acae13ff3f0a63cd74432eb67c8cc6f
 SHA512:
-  metadata.gz: a883d5c8a999da8fb3f0bda1811678905858d1693f69b846b975b66f2c25cbdbf0bfa7c671ceb991519f2b68972ae2cef71bd08be7a21f03cda07a5dfbe6cc9e
-  data.tar.gz: d0882dff25bb3c47491036de7988d4e1fd392e6d1806e49a287ebcd4cf02e9e70a6a64b829e07102e16607ea31363ba17afb1dbed0968450df66e02ba2033330
+  metadata.gz: f9927865a15b7e1310566776820ffd86fa29788fa6db29dc0c030afd681f7055f1991e8c031a043ee80d2219698440c25d2d80ff796b2a112319cd551f7f0445
+  data.tar.gz: 9e56593a4e2fc70245eb0c91d60e3172938c3b9932725ef94e385e8ce2dae2522f49d24ac950b38b25e0b1e920f8036bb09fa9dfd09272c08b54dc573d93710b

data/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/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/app/controllers/decidim/proposals/proposals_controller.rb

@@ -7,6 +7,8 @@ module Decidim
       include FormFactory
       include FilterResource
 
+      helper_method :order, :random_seed
+
       before_action :authenticate_user!, only: [:new, :create]
 
       def show
@@ -17,11 +19,20 @@ module Decidim
         @proposals = search
                      .results
                      .includes(:author)
-                     .includes(votes: [:author])
-                     .page(params[:page])
-                     .per(12)
+                     .includes(:category)
+                     .includes(:scope)
+
+        @proposals = @proposals.page(params[:page]).per(12)
+        @proposals = reorder(@proposals)
 
-        @random_seed = search.random_seed
+        @voted_proposals = if current_user
+                             ProposalVote.where(
+                               author: current_user,
+                               proposal: @proposals
+                             ).pluck(:decidim_proposal_id)
+                           else
+                             []
+                           end
       end
 
       def new
@@ -50,6 +61,31 @@ module Decidim
 
       private
 
+      def order
+        @order = params[:order] || "random"
+      end
+
+      # Returns: A random float number between -1 and 1 to be used as a random seed at the database.
+      def random_seed
+        @random_seed ||= (params[:random_seed] ? params[:random_seed].to_f : (rand * 2 - 1))
+      end
+
+      def reorder(proposals)
+        case order
+        when "random"
+          Proposal.transaction do
+            Proposal.connection.execute("SELECT setseed(#{Proposal.connection.quote(random_seed)})")
+            proposals.order("RANDOM()").load
+          end
+        when "most_voted"
+          proposals.order(proposal_votes_count: :desc)
+        when "recent"
+          proposals.order(created_at: :desc)
+        else
+          proposals
+        end
+      end
+
       def search_klass
         ProposalSearch
       end
@@ -61,7 +97,8 @@ module Decidim
           activity: "",
           category_id: "",
           state: "all",
-          random_seed: params[:random_seed]
+          scope_id: "",
+          related_to: ""
         }
       end
     end

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

@@ -11,7 +11,9 @@ module Decidim
       attribute :scope_id, Integer
       attribute :user_group_id, Integer
 
-      validates :title, :body, presence: true
+      validates :title, :body, presence: true, etiquette: true
+      validates :title, length: { maximum: 150 }
+      validates :body, length: { maximum: 500 }, etiquette: true
       validates :category, presence: true, if: ->(form) { form.category_id.present? }
       validates :scope, presence: true, if: ->(form) { form.scope_id.present? }
 

data/app/helpers/decidim/proposals/proposal_votes_helper.rb

@@ -27,7 +27,7 @@ module Decidim
       #
       # Returns true if the vote limit is enabled
       def vote_limit_enabled?
-        current_user && feature_settings.vote_limit.present? && feature_settings.vote_limit.positive?
+        current_user && current_settings.votes_enabled? && feature_settings.vote_limit.present? && feature_settings.vote_limit.positive?
       end
 
       # Return the remaining votes for a user if the current feature has a vote limit

data/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/app/models/decidim/proposals/abilities/current_user.rb

@@ -16,27 +16,38 @@ module Decidim
           @context = context
 
           can :vote, Proposal do |_proposal|
-            voting_enabled? && remaining_votes.positive?
+            authorized?(:vote) && voting_enabled? && remaining_votes.positive?
           end
 
           can :unvote, Proposal do |_proposal|
-            voting_enabled? && vote_limit_enabled?
+            authorized?(:vote) && voting_enabled? && vote_limit_enabled?
           end
 
-          can :create, Proposal if current_settings.try(:creation_enabled?)
+          can :create, Proposal if authorized?(:create) && creation_enabled?
         end
 
         private
 
+        def authorized?(action)
+          return unless feature
+
+          ActionAuthorizer.new(user, feature, action).authorize.ok?
+        end
+
         def vote_limit_enabled?
           return unless feature_settings
           feature_settings.vote_limit.present? && feature_settings.vote_limit.positive?
         end
 
+        def creation_enabled?
+          return unless current_settings
+          current_settings.creation_enabled?
+        end
+
         def remaining_votes
           return 1 unless vote_limit_enabled?
 
-          proposals = Proposal.where(feature: context.fetch(:current_feature))
+          proposals = Proposal.where(feature: feature)
           votes_count = ProposalVote.where(author: user, proposal: proposals).size
           feature_settings.vote_limit - votes_count
         end
@@ -53,6 +64,13 @@ module Decidim
         def feature_settings
           context.fetch(:feature_settings, nil)
         end
+
+        def feature
+          feature = context.fetch(:current_feature, nil)
+          return nil unless feature && feature.manifest.name == :proposals
+
+          feature
+        end
       end
     end
   end

data/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/app/models/decidim/proposals/proposal.rb

@@ -8,10 +8,11 @@ module Decidim
       include Decidim::HasFeature
       include Decidim::HasScope
       include Decidim::HasCategory
+      include Decidim::Comments::Commentable
 
       feature_manifest_name "proposals"
 
-      has_many :votes, foreign_key: "decidim_proposal_id", class_name: ProposalVote, dependent: :destroy
+      has_many :votes, foreign_key: "decidim_proposal_id", class_name: ProposalVote, dependent: :destroy, counter_cache: "proposal_votes_count"
 
       validates :title, :body, presence: true
 
@@ -30,7 +31,7 @@ module Decidim
       #
       # Returns Boolean.
       def voted_by?(user)
-        votes.any? { |vote| vote.author == user }
+        votes.where(author: user).any?
       end
 
       # Public: Checks if the organization has given an answer for the proposal.
@@ -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/app/services/decidim/proposals/proposal_search.rb

@@ -8,10 +8,8 @@ module Decidim
       # feature     - A Decidim::Feature to get the proposals from.
       # page        - The page number to paginate the results.
       # per_page    - The number of proposals to return per page.
-      # random_seed - A random flaot number between -1 and 1 to be used as a random seed at the database.
       def initialize(options = {})
         super(Proposal.all, options)
-        @random_seed = options[:random_seed].to_f
       end
 
       # Handle the search_text filter
@@ -46,6 +44,11 @@ module Decidim
         end
       end
 
+      # Handle the scope_id filter
+      def search_scope_id
+        query.where(decidim_scope_id: scope_id)
+      end
+
       # Handle the state filter
       def search_state
         if state == "accepted"
@@ -57,18 +60,27 @@ module Decidim
         end
       end
 
-      # Returns the random proposals for the current page.
-      def results
-        @proposals ||= Proposal.transaction do
-          Proposal.connection.execute("SELECT setseed(#{Proposal.connection.quote(random_seed)})")
-          super.reorder("RANDOM()").load
-        end
-      end
+      # Filters Proposals by the name of the classes they are linked to. By default,
+      # returns all Proposals. When a `related_to` param is given, then it camelcases item
+      # to find the real class name and checks the links for the Proposals.
+      #
+      # The `related_to` param is expected to be in this form:
+      #
+      #   "decidim/meetings/meeting"
+      #
+      # This can be achieved by performing `klass.name.underscore`.
+      #
+      # Returns only those proposals that are linked to the given class name.
+      def search_related_to
+        from = query
+               .joins(:resource_links_from)
+               .where(decidim_resource_links: { to_type: related_to.camelcase })
+
+        to = query
+             .joins(:resource_links_to)
+             .where(decidim_resource_links: { from_type: related_to.camelcase })
 
-      # Returns the random seed used to randomize the proposals.
-      def random_seed
-        @random_seed = (rand * 2 - 1) if @random_seed == 0.0 || @random_seed > 1 || @random_seed < -1
-        @random_seed
+        query.where(id: from).or(query.where(id: to))
       end
     end
   end

data/app/views/decidim/proposals/admin/proposal_answers/edit.html.erb

@@ -1,6 +1,6 @@
 <h3><%= t ".title", title: proposal.title %></h3>
 
-<%= form_for(@form, url: proposal_proposal_answer_path(proposal, @form)) do |f| %>
+<%=  decidim_form_for(@form, url: proposal_proposal_answer_path(proposal, @form)) do |f| %>
   <div class="field">
     <%= f.collection_radio_buttons :state, [["accepted", t('.accepted')], ["rejected", t('.rejected')]], :first, :last, prompt: true %>
   </div>

data/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/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 %>