decidim-budgets 0.22.0 → 0.23.3

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

@@ -20,12 +20,12 @@ module Decidim
         def create
           enforce_permission_to :create, :project
 
-          @form = form(ProjectForm).from_params(params)
+          @form = form(ProjectForm).from_params(params, budget: budget)
 
           CreateProject.call(@form) do
             on(:ok) do
               flash[:notice] = I18n.t("projects.create.success", scope: "decidim.budgets.admin")
-              redirect_to projects_path
+              redirect_to budget_projects_path(budget)
             end
 
             on(:invalid) do
@@ -43,12 +43,12 @@ module Decidim
 
         def update
           enforce_permission_to :update, :project, project: project
-          @form = form(ProjectForm).from_params(params)
+          @form = form(ProjectForm).from_params(params, budget: budget)
 
           UpdateProject.call(@form, project) do
             on(:ok) do
               flash[:notice] = I18n.t("projects.update.success", scope: "decidim.budgets.admin")
-              redirect_to projects_path
+              redirect_to budget_projects_path(budget)
             end
 
             on(:invalid) do
@@ -64,7 +64,7 @@ module Decidim
           DestroyProject.call(project, current_user) do
             on(:ok) do
               flash[:notice] = I18n.t("projects.destroy.success", scope: "decidim.budgets.admin")
-              redirect_to projects_path
+              redirect_to budget_projects_path(budget)
             end
           end
         end
@@ -72,11 +72,11 @@ module Decidim
         private
 
         def projects
-          @projects ||= Project.where(component: current_component).page(params[:page]).per(15)
+          @projects ||= budget.projects.page(params[:page]).per(15)
         end
 
         def orders
-          @orders ||= Order.where(component: current_component)
+          @orders ||= Order.where(budget: budget)
         end
 
         def pending_orders

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

@@ -4,6 +4,8 @@ module Decidim
   module Budgets
     module Admin
       class ProposalsImportsController < Admin::ApplicationController
+        helper_method :budget
+
         def new
           enforce_permission_to :import_proposals, :projects
 
@@ -13,11 +15,11 @@ module Decidim
         def create
           enforce_permission_to :import_proposals, :projects
 
-          @form = form(Admin::ProjectImportProposalsForm).from_params(params)
+          @form = form(Admin::ProjectImportProposalsForm).from_params(params, budget: budget)
           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
+              redirect_to budget_projects_path(budget)
             end
 
             on(:invalid) do
@@ -26,6 +28,12 @@ module Decidim
             end
           end
         end
+
+        private
+
+        def budget
+          @budget ||= Budget.where(component: current_component).find_by(id: params[:budget_id])
+        end
       end
     end
   end

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

@@ -8,6 +8,29 @@ module Decidim
     # Note that it inherits from `Decidim::Components::BaseController`, which
     # override its layout and provide all kinds of useful methods.
     class ApplicationController < Decidim::Components::BaseController
+      helper_method :current_workflow, :voting_finished?, :voting_open?
+
+      def current_workflow
+        @current_workflow ||= Decidim::Budgets.workflows[workflow_name].new(current_component, current_user)
+      end
+
+      def voting_open?
+        current_settings.votes == "enabled"
+      end
+
+      def voting_finished?
+        current_settings.votes == "finished"
+      end
+
+      def show_votes_count?
+        current_settings.show_votes?
+      end
+
+      private
+
+      def workflow_name
+        @workflow_name ||= current_component.settings.workflow.to_sym
+      end
     end
   end
 end

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    # Exposes the budget resources so users can participate on them
+    class BudgetsController < Decidim::Budgets::ApplicationController
+      def index
+        redirect_to budget_projects_path(current_workflow.single) if current_workflow.single?
+      end
+
+      def show
+        raise ActionController::RoutingError, "Not Found" unless budget
+
+        redirect_to budget_projects_path(budget)
+      end
+
+      private
+
+      def budget
+        @budget ||= Budget.where(component: current_component).includes(:projects).find_by(id: params[:id])
+      end
+    end
+  end
+end

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

@@ -6,16 +6,16 @@ module Decidim
     class LineItemsController < Decidim::Budgets::ApplicationController
       include NeedsCurrentOrder
 
-      helper_method :project
+      helper_method :budget, :project
 
       def create
-        enforce_permission_to :vote, :project, project: project
+        enforce_permission_to :vote, :project, project: project, budget: budget, workflow: current_workflow
 
         respond_to do |format|
           AddLineItem.call(persisted_current_order, project, current_user) do
             on(:ok) do |order|
               self.current_order = order
-              format.html { redirect_to :back }
+              format.html { redirect_back(fallback_location: budget_path(budget)) }
               format.js { render "update_budget" }
             end
 
@@ -30,7 +30,7 @@ module Decidim
         respond_to do |format|
           RemoveLineItem.call(current_order, project) do
             on(:ok) do |_order|
-              format.html { redirect_to :back }
+              format.html { redirect_back(fallback_location: budget_path(budget)) }
               format.js { render "update_budget" }
             end
 
@@ -44,7 +44,11 @@ module Decidim
       private
 
       def project
-        @project ||= Project.find_by(id: params[:project_id], component: current_component)
+        @project ||= Project.includes(:budget).find_by(id: params[:project_id], decidim_budgets_budget_id: params[:budget_id])
+      end
+
+      def budget
+        @budget ||= project.budget
       end
     end
   end

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

@@ -7,17 +7,17 @@ module Decidim
       include NeedsCurrentOrder
 
       def checkout
-        enforce_permission_to :vote, :project, order: current_order
+        enforce_permission_to :vote, :project, order: current_order, budget: budget, workflow: current_workflow
 
-        Checkout.call(current_order, current_component) do
+        Checkout.call(current_order) do
           on(:ok) do
             flash[:notice] = I18n.t("orders.checkout.success", scope: "decidim")
-            redirect_to projects_path
+            redirect_to budgets_path
           end
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("orders.checkout.error", scope: "decidim")
-            redirect_to projects_path
+            redirect_to budgets_path
           end
         end
       end
@@ -26,15 +26,29 @@ module Decidim
         CancelOrder.call(current_order) do
           on(:ok) do
             flash[:notice] = I18n.t("orders.destroy.success", scope: "decidim")
-            redirect_to projects_path
+            redirect_to redirect_path
           end
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("orders.destroy.error", scope: "decidim")
-            redirect_to projects_path
+            redirect_to redirect_path
           end
         end
       end
+
+      private
+
+      def budget
+        @budget ||= Budget.find_by(id: params[:budget_id])
+      end
+
+      def redirect_path
+        if params.dig(:return_to) == "budget"
+          budget_path(budget)
+        else
+          budgets_path
+        end
+      end
     end
   end
 end

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

@@ -6,13 +6,25 @@ module Decidim
     class ProjectsController < Decidim::Budgets::ApplicationController
       include FilterResource
       include NeedsCurrentOrder
-      include Orderable
       include Decidim::Budgets::Orderable
 
-      helper_method :projects, :project
+      helper_method :projects, :project, :budget
+
+      def index
+        raise ActionController::RoutingError, "Not Found" unless budget
+      end
+
+      def show
+        raise ActionController::RoutingError, "Not Found" unless budget
+        raise ActionController::RoutingError, "Not Found" unless project
+      end
 
       private
 
+      def budget
+        @budget ||= Budget.where(component: current_component).includes(:projects).find_by(id: params[:budget_id])
+      end
+
       def projects
         return @projects if @projects
 
@@ -21,7 +33,7 @@ module Decidim
       end
 
       def project
-        @project ||= search.results.find(params[:id])
+        @project ||= Project.find_by(id: params[:id])
       end
 
       def search_klass
@@ -31,29 +43,18 @@ module Decidim
       def default_filter_params
         {
           search_text: "",
+          status: default_filter_status_params,
           scope_id: default_filter_scope_params,
           category_id: default_filter_category_params
         }
       end
 
-      def default_filter_category_params
-        return "all" unless current_component.participatory_space.categories.any?
-
-        ["all"] + current_component.participatory_space.categories.map { |category| category.id.to_s }
-      end
-
-      def default_filter_scope_params
-        return "all" unless current_component.participatory_space.scopes.any?
-
-        if current_component.participatory_space.scope
-          ["all", current_component.participatory_space.scope.id] + current_component.participatory_space.scope.children.map { |scope| scope.id.to_s }
-        else
-          %w(all global) + current_component.participatory_space.scopes.map { |scope| scope.id.to_s }
-        end
+      def default_filter_status_params
+        voting_finished? ? %w(selected) : %w(all)
       end
 
       def context_params
-        { component: current_component, organization: current_organization }
+        { budget: budget, component: current_component, organization: current_organization }
       end
     end
   end

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    module Admin
+      # This class holds a Form to create/update budgets from Decidim's admin panel.
+      class BudgetForm < Decidim::Form
+        include TranslatableAttributes
+
+        mimic :budget
+
+        translatable_attribute :title, String
+        attribute :weight, Integer, default: 0
+        translatable_attribute :description, String
+        attribute :total_budget, Integer, default: 0
+        attribute :decidim_scope_id, Integer
+
+        validates :title, translatable_presence: true
+        validates :weight, :total_budget, numericality: { greater_than_or_equal_to: 0 }
+        validates :scope, presence: true, if: ->(form) { form.decidim_scope_id.present? }
+        validates :decidim_scope_id, scope_belongs_to_component: true, if: ->(form) { form.decidim_scope_id.present? }
+
+        # Finds the Scope from the given decidim_scope_id, uses the compoenent scope if missing.
+        #
+        # Returns a Decidim::Scope
+        def scope
+          @scope ||= @decidim_scope_id ? current_component.scopes.find_by(id: @decidim_scope_id) : current_component.scope
+        end
+
+        # Scope identifier
+        #
+        # Returns the scope identifier related to the meeting
+        def decidim_scope_id
+          @decidim_scope_id || scope&.id
+        end
+      end
+    end
+  end
+end

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

@@ -12,22 +12,22 @@ module Decidim
         translatable_attribute :title, String
         translatable_attribute :description, String
 
-        attribute :budget, Integer
+        attribute :budget_amount, Integer
         attribute :decidim_scope_id, Integer
         attribute :decidim_category_id, Integer
         attribute :proposal_ids, Array[Integer]
         attribute :attachment, AttachmentForm
         attribute :photos, Array[String]
         attribute :add_photos, Array
+        attribute :selected, Boolean
 
         validates :title, translatable_presence: true
         validates :description, translatable_presence: true
-        validates :budget, presence: true, numericality: { greater_than: 0 }
+        validates :budget_amount, presence: true, numericality: { greater_than: 0 }
 
         validates :category, presence: true, if: ->(form) { form.decidim_category_id.present? }
         validates :scope, presence: true, if: ->(form) { form.decidim_scope_id.present? }
-
-        validate :scope_belongs_to_participatory_space_scope
+        validates :decidim_scope_id, scope_belongs_to_component: true, if: ->(form) { form.decidim_scope_id.present? }
 
         validate :notify_missing_attachment_if_errored
 
@@ -35,6 +35,7 @@ module Decidim
 
         def map_model(model)
           self.proposal_ids = model.linked_resources(:proposals, "included_proposals").pluck(:id)
+          self.selected = model.selected?
 
           return unless model.categorization
 
@@ -47,6 +48,13 @@ module Decidim
                          &.order(title: :asc)
         end
 
+        # Finds the Budget from the decidim_budgets_budget_id.
+        #
+        # Returns a Decidim::Budgets:Budget
+        def budget
+          @budget ||= context[:budget]
+        end
+
         # Finds the Category from the decidim_category_id.
         #
         # Returns a Decidim::Category
@@ -54,11 +62,11 @@ module Decidim
           @category ||= categories.find_by(id: decidim_category_id)
         end
 
-        # Finds the Scope from the given decidim_scope_id, uses participatory space scope if missing.
+        # Finds the Scope from the given decidim_scope_id, uses the component scope if missing.
         #
         # Returns a Decidim::Scope
         def scope
-          @scope ||= @decidim_scope_id ? current_participatory_space.scopes.find_by(id: @decidim_scope_id) : current_participatory_space.scope
+          @scope ||= @decidim_scope_id ? current_component.scopes.find_by(id: @decidim_scope_id) : current_component.scope
         end
 
         # Scope identifier
@@ -70,10 +78,6 @@ module Decidim
 
         private
 
-        def scope_belongs_to_participatory_space_scope
-          errors.add(:decidim_scope_id, :invalid) if current_participatory_space.out_of_scope?(scope)
-        end
-
         # This method will add an error to the `attachment` field only if there's
         # any error in any other field. This is needed because when the form has
         # an error, the attachment is lost, so we need a way to inform the user of

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

@@ -29,6 +29,10 @@ module Decidim
             [component.name[I18n.locale.to_s], component.id]
           end
         end
+
+        def budget
+          @budget ||= context[:budget]
+        end
       end
     end
   end

data/app/helpers/decidim/budgets/admin/application_helper.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    module Admin
+      # Custom helpers, scoped to the budgets admin engine.
+      #
+      module ApplicationHelper
+        include Decidim::Admin::ResourceScopeHelper
+      end
+    end
+  end
+end