decidim-budgets 0.13.1 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d57451a0817b12755de8c494193e41145a4913d9aa19e68c783104f90224897
-  data.tar.gz: f496dd16ecdd5f904fd63a6360cdb04f0ad08a068d9dae869d8eb993761f2d4a
+  metadata.gz: 5c4245371508038885cb48f6ed330288461ea8554a24678fc0a250a928cbff4a
+  data.tar.gz: 00d30ac4b1662d12100a97767a53594f7412a15e71ce55d3827f841358c2665b
 SHA512:
-  metadata.gz: 162e5bf6ea382161f98d45a43ad66170fd2418e93a568690b01e1ae16faab21c90d3100c80d464ffe1dbdd1e467e344213595c396a5781c6ee9614145b163270
-  data.tar.gz: 92f793cc2251d01ccd1668b68954a5a56b88de3486e8aae63089ee01aaf8149023dae7f92259323a0f8edff0e72f36a70c3787f5b4001505b5b70612f52e4d98
+  metadata.gz: 1c3847ceb6895e9720c993cd147db952e1147b22c6293be831bb486680161edefc188602e4f774d74819b78fae0ab9207c7d67867874bc9d363e1c17c40b8c44
+  data.tar.gz: 4b71590a413f024134ceb00827291c1f51acaad882537e249d0e4adeef85e9f856ff2b5bee0563af2234caf1ce9def5f6c5ff87ba11fca1298d36aad68dd15a0

data/app/cells/decidim/budgets/project_cell.rb

@@ -8,7 +8,7 @@ module Decidim
       include Cell::ViewModel::Partial
 
       def show
-        cell card_size, model
+        cell card_size, model, options
       end
 
       private

data/app/commands/decidim/budgets/admin/import_proposals_to_budgets.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    module Admin
+      # A command with all the business logic when an admin imports proposals from
+      # one component to budget component.
+      class ImportProposalsToBudgets < Rectify::Command
+        # Public: Initializes the command.
+        #
+        # form - A form object with the params.
+        def initialize(form)
+          @form = form
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form wasn't valid and we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) unless @form.valid?
+
+          broadcast(:ok, create_projects_from_accepted_proposals)
+        end
+
+        private
+
+        attr_reader :form
+
+        def create_projects_from_accepted_proposals
+          transaction do
+            proposals.map do |original_proposal|
+              next if proposal_already_copied?(original_proposal, target_component)
+
+              project = Decidim::Budgets::Project.new
+              project.title = project_localized(original_proposal.title)
+              project.description = project_localized(original_proposal.body)
+              project.budget = form.default_budget
+              project.category = original_proposal.category
+              project.component = target_component
+              project.save!
+
+              project.link_resources([original_proposal], "included_proposals")
+            end.compact
+          end
+        end
+
+        def proposals
+          Decidim::Proposals::Proposal.where(component: origin_component).where(state: "accepted")
+        end
+
+        def origin_component
+          @form.origin_component
+        end
+
+        def target_component
+          @form.current_component
+        end
+
+        def proposal_already_copied?(original_proposal, target_component)
+          original_proposal.linked_resources(:projects, "included_proposals").any? do |proposal|
+            proposal.component == target_component
+          end
+        end
+
+        def project_localized(text)
+          Decidim.available_locales.inject({}) do |result, locale|
+            result.update(locale => text)
+          end.with_indifferent_access
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/budgets/admin/attachment_collections_controller.rb

@@ -19,10 +19,6 @@ module Decidim
         def project
           @project ||= projects.find(params[:project_id])
         end
-
-        def authorization_object
-          project.component
-        end
       end
     end
   end

data/app/controllers/decidim/budgets/admin/attachments_controller.rb

@@ -20,10 +20,6 @@ module Decidim
         def project
           @project ||= projects.find(params[:project_id])
         end
-
-        def authorization_object
-          project.component
-        end
       end
     end
   end

data/app/controllers/decidim/budgets/admin/proposals_imports_controller.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    module Admin
+      class ProposalsImportsController < Admin::ApplicationController
+        def new
+          enforce_permission_to :import_proposals, :projects
+
+          @form = form(Admin::ProjectImportProposalsForm).instance
+        end
+
+        def create
+          enforce_permission_to :import_proposals, :projects
+
+          @form = form(Admin::ProjectImportProposalsForm).from_params(params)
+          Admin::ImportProposalsToBudgets.call(@form) do
+            on(:ok) do |projects|
+              flash[:notice] = I18n.t("proposals_imports.create.success", scope: "decidim.budgets.admin", number: projects.length)
+              redirect_to EngineRouter.admin_proxy(current_component).root_path
+            end
+
+            on(:invalid) do
+              flash[:alert] = I18n.t("proposals_imports.create.invalid", scope: "decidim.budgets.admin")
+              render action: "new"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/budgets/line_items_controller.rb

@@ -9,7 +9,7 @@ module Decidim
       helper_method :project
 
       def create
-        authorize_action! "vote"
+        enforce_permission_to :vote, :project, project: project
 
         respond_to do |format|
           AddLineItem.call(current_order, project, current_user) do

data/app/controllers/decidim/budgets/orders_controller.rb

@@ -7,7 +7,7 @@ module Decidim
       include NeedsCurrentOrder
 
       def checkout
-        authorize_action! "vote"
+        enforce_permission_to :vote, :project, order: current_order
 
         Checkout.call(current_order, current_component) do
           on(:ok) do

data/app/forms/decidim/budgets/admin/project_form.rb

@@ -7,6 +7,7 @@ module Decidim
       class ProjectForm < Decidim::Form
         include TranslatableAttributes
         include TranslationsHelper
+        include Decidim::ApplicationHelper
 
         translatable_attribute :title, String
         translatable_attribute :description, String
@@ -36,7 +37,9 @@ module Decidim
         end
 
         def proposals
-          @proposals ||= Decidim.find_resource_manifest(:proposals).try(:resource_scope, current_component)&.order(title: :asc)&.pluck(:title, :id)
+          @proposals ||= Decidim.find_resource_manifest(:proposals).try(:resource_scope, current_component)
+                         &.order(title: :asc)
+                         &.map { |proposal| [present(proposal).title, proposal.id] }
         end
 
         # Finds the Category from the decidim_category_id.

data/app/forms/decidim/budgets/admin/project_import_proposals_form.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    module Admin
+      # A form object to be used when admin users want to import a collection of proposals
+      # from another component into projects component.
+      class ProjectImportProposalsForm < Decidim::Form
+        mimic :proposals_import
+
+        attribute :origin_component_id, Integer
+        attribute :default_budget, Integer
+        attribute :import_all_accepted_proposals, Boolean
+
+        validates :origin_component_id, :origin_component, :current_component, presence: true
+        validates :import_all_accepted_proposals, allow_nil: false, acceptance: true
+        validates :default_budget, presence: true, numericality: { greater_than: 0 }
+
+        def origin_component
+          @origin_component ||= origin_components.find_by(id: origin_component_id)
+        end
+
+        def origin_components
+          @origin_components ||= current_participatory_space.components.where(manifest_name: :proposals)
+        end
+
+        def origin_components_collection
+          origin_components.map do |component|
+            [component.name[I18n.locale.to_s], component.id]
+          end
+        end
+      end
+    end
+  end
+end

data/app/models/decidim/budgets/project.rb

@@ -49,6 +49,11 @@ module Decidim
       def confirmed_orders_count
         orders.finished.count
       end
+
+      # Public: Overrides the `allow_resource_permissions?` Resourceable concern method.
+      def allow_resource_permissions?
+        component.settings.resources_permissions_enabled
+      end
     end
   end
 end

data/app/permissions/decidim/budgets/admin/permissions.rb

@@ -8,11 +8,13 @@ module Decidim
           # The public part needs to be implemented yet
           return permission_action if permission_action.scope != :admin
 
-          return permission_action if permission_action.subject != :project
+          return permission_action unless [:project, :projects].include?(permission_action.subject)
 
           case permission_action.action
           when :create
             permission_action.allow!
+          when :import_proposals
+            permission_action.allow!
           when :update, :destroy
             permission_action.allow! if project.present?
           end

data/app/permissions/decidim/budgets/permissions.rb

@@ -13,12 +13,30 @@ module Decidim
         return permission_action if permission_action.subject != :project
 
         case permission_action.action
+        when :vote
+          can_vote_project?(project || order&.projects&.first)
         when :report
           permission_action.allow!
         end
 
         permission_action
       end
+
+      private
+
+      def project
+        @project ||= context.fetch(:project, nil)
+      end
+
+      def order
+        @order ||= context.fetch(:order, nil)
+      end
+
+      def can_vote_project?(a_project)
+        is_allowed = a_project && authorized?(:vote, resource: project)
+
+        toggle_allow(is_allowed)
+      end
     end
   end
 end

data/app/views/decidim/budgets/admin/projects/index.html.erb

@@ -2,7 +2,8 @@
   <div class="card-divider">
     <h2 class="card-title">
       <%= t(".title") %>
-      <%= link_to t("actions.new", scope: "decidim.budgets"), new_project_path, class: "button tiny button--title" if allowed_to? :create, :project %>
+      <%= link_to t("actions.new", scope: "decidim.budgets"), new_project_path, class: "button tiny button--title new" if allowed_to? :create, :project %>
+      <%= link_to t("actions.import", scope: "decidim.budgets", name: t("models.project.name", scope: "decidim.budgets.admin")), new_proposals_import_path, class: "button tiny button--title" if allowed_to? :import_proposals, :project %>
     </h2>
   </div>
 
@@ -40,6 +41,8 @@
                   <%= icon_link_to "paperclip", project_attachments_path(project), t("actions.attachments", scope: "decidim.budgets"), class: "action-icon--attachments" %>
                 <% end %>
 
+                <%= resource_permissions_link(project) %>
+
                 <% if allowed_to? :destroy, :project, project: project %>
                   <%= icon_link_to "circle-x", project_path(project), t("actions.destroy", scope: "decidim.budgets"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.budgets") } %>
                 <% end %>

data/app/views/decidim/budgets/admin/proposals_imports/new.html.erb

@@ -0,0 +1,27 @@
+<%= decidim_form_for(@form, url: proposals_import_path, html: { class: "form import_proposals" }) do |f| %>
+  <% if @form.origin_components.any? %>
+    <div class="card">
+      <div class="card-divider">
+        <h2 class="card-title"><%= title %></h2>
+      </div>
+
+      <div class="card-section">
+        <div class="row column">
+          <%= f.select :origin_component_id, @form.origin_components_collection, prompt: t(".select_component") %>
+        </div>
+        <div class="row column">
+          <%= f.number_field :default_budget %>
+        </div>
+        <div class="row column">
+          <%= f.check_box :import_all_accepted_proposals %>
+        </div>
+      </div>
+    </div>
+
+    <div class="button--double form-general-submit">
+      <%= f.submit t(".create") %>
+    </div>
+  <% else %>
+      <p><%= t(".no_components") %></p>
+  <% end %>
+<% end %>

data/app/views/decidim/budgets/line_items/update_budget.js.erb

@@ -5,20 +5,20 @@ var $projectItem = $('#project-<%= project.id %>-item');
 var $projectBudgetButton = $('#project-<%= project.id %>-budget-button');
 var $budgetConfirm = $('#budget-confirm');
 
-morphdom($orderTotalBudget[0], '<%= j(render partial: 'decidim/budgets/projects/order_total_budget').strip.html_safe %>');
-morphdom($orderSelectedProjects[0], '<%= j(render partial: 'decidim/budgets/projects/order_selected_projects').strip.html_safe %>');
-morphdom($orderProgress[0], '<%= j(render partial: 'decidim/budgets/projects/order_progress').strip.html_safe %>');
-morphdom($budgetConfirm[0], '<%= j(render partial: 'decidim/budgets/projects/budget_confirm').strip.html_safe %>')
+morphdom($orderTotalBudget[0], '<%= j(render partial: "decidim/budgets/projects/order_total_budget").strip.html_safe %>');
+morphdom($orderSelectedProjects[0], '<%= j(render partial: "decidim/budgets/projects/order_selected_projects").strip.html_safe %>');
+morphdom($orderProgress[0], '<%= j(render partial: "decidim/budgets/projects/order_progress").strip.html_safe %>');
+morphdom($budgetConfirm[0], '<%= j(render partial: "decidim/budgets/projects/budget_confirm").strip.html_safe %>')
 
 $("#order-progress").foundation();
 $(".budget-summary__selected").foundation();
 
 if ($projectItem.length > 0) {
-  morphdom($projectItem[0], '<%= j(render partial: 'decidim/budgets/projects/project', locals: { project: project }).strip.html_safe %>');
+  morphdom($projectItem[0], '<%= j(render partial: "decidim/budgets/projects/project", locals: { project: project }).strip.html_safe %>');
 }
 
 if ($projectBudgetButton.length > 0) {
-  morphdom($projectBudgetButton[0], '<%= j(render partial: 'decidim/budgets/projects/project_budget_button', locals: { project: project }).strip.html_safe %>');
+  morphdom($projectBudgetButton[0], '<%= j(render partial: "decidim/budgets/projects/project_budget_button", locals: { project: project }).strip.html_safe %>');
 }
 
 window.DecidimBudgets.checkProgressPosition();

data/app/views/decidim/budgets/projects/_project.html.erb

@@ -6,7 +6,7 @@
           <%= translated_attribute project.title %>
         </h5>
       <% end %>
-      <%= cell "decidim/tags", project, context: {extra_classes: ["tags--project"]} %>
+      <%= cell "decidim/tags", project, context: { extra_classes: ["tags--project"] } %>
     </div>
   </div>
   <% if current_user.present? %>

data/app/views/decidim/budgets/projects/show.html.erb

@@ -3,6 +3,15 @@
   description: translated_attribute(project.description)
 ) %>
 
+<%
+edit_link(
+  resource_locator(project).edit,
+  :update,
+  :project,
+  project: project
+)
+%>
+
 <div class="row column view-header">
   <% if current_user.present? && current_settings.votes_enabled? && current_participatory_space.can_participate?(current_user) %>
     <%= render partial: "budget_summary", locals: { include_heading: false } %>
@@ -38,7 +47,7 @@
   <div class="columns mediumlarge-8 mediumlarge-pull-4">
     <div class="section">
       <%= decidim_sanitize translated_attribute project.description %>
-      <%= cell "decidim/tags", project, context: {extra_classes: ["tags--project"]} %>
+      <%= cell "decidim/tags", project, context: { extra_classes: ["tags--project"] } %>
     </div>
     <%= linked_resources_for project, :proposals, "included_proposals" %>
     <%= linked_resources_for project, :results, "included_projects" %>

data/config/locales/ca.yml

@@ -21,6 +21,7 @@ ca:
         confirm_destroy: Segur que vols eliminar aquest projecte?
         destroy: Esborrar
         edit: Editar
+        import: Importa propostes a projectes
         new: Nou projecte
         preview: Previsualitzar
         title: Accions
@@ -47,6 +48,14 @@ ca:
           update:
             invalid: Hi ha hagut un problema actualitzant aquest projecte
             success: Projecte actualitzat correctament
+        proposals_imports:
+          create:
+            invalid: Hi ha hagut un problema en importar les propostes en projectes
+            success: "S'ha importat amb èxit %{number} propostes en projectes"
+          new:
+            create: Importa propostes a projectes
+            no_components: No hi ha cap component de propostes en aquest espai participatiu per importar les propostes a projectes.
+            select_component: Selecciona un component
       admin_log:
         project:
           create: "%{user_name} ha creat el projecte %{resource_name} a l'espai %{space_name}"
@@ -121,6 +130,7 @@ ca:
             announcement: Anunci
             comments_enabled: Comentaris habilitats
             projects_per_page: Projectes per pàgina
+            resources_permissions_enabled: Es poden establir permisos d'accions per a cada trobada
             total_budget: Pressupost total
             vote_threshold_percent: Percentatge del pressupost mínim per fer el vot
           step:

data/config/locales/en.yml

@@ -22,6 +22,7 @@ en:
         confirm_destroy: Are you sure you want to delete this project?
         destroy: Delete
         edit: Edit
+        import: Import proposals to projects
         new: New project
         preview: Preview
         title: Actions
@@ -48,6 +49,14 @@ en:
           update:
             invalid: There's been a problem updating this project
             success: Project successfully updated
+        proposals_imports:
+          create:
+            invalid: There's been a problem importing the proposals into projects
+            success: "%{number} proposals successfully imported into projects"
+          new:
+            create: Import proposals to projects
+            no_components: There are no other proposal components in this participatory space to import the proposals into projects.
+            select_component: Please select a component
       admin_log:
         project:
           create: "%{user_name} created the %{resource_name} project in the %{space_name} space"
@@ -122,6 +131,7 @@ en:
             announcement: Announcement
             comments_enabled: Comments enabled
             projects_per_page: Projects per page
+            resources_permissions_enabled: Actions permissions can be set for each meeting
             total_budget: Total budget
             vote_threshold_percent: Vote threshold percent
           step: