decidim 0.4.0 → 0.4.1

data/decidim-admin/app/controllers/decidim/admin/concerns/participatory_process_admin.rb

@@ -10,17 +10,10 @@ module Decidim
         extend ActiveSupport::Concern
 
         included do
-          helper_method :participatory_process
+          include Decidim::NeedsParticipatoryProcess
 
           layout "decidim/admin/participatory_process"
         end
-
-        private
-
-        def participatory_process
-          @participatory_process ||=
-            current_organization.participatory_processes.find(params[:participatory_process_id])
-        end
       end
     end
   end

data/decidim-admin/app/controllers/decidim/admin/exports_controller.rb

@@ -23,7 +23,7 @@ module Decidim
         send(
           "decidim_admin_#{feature.manifest.name}_path",
           feature_id: feature.id,
-          participatory_process_id: participatory_process.id
+          participatory_process_id: current_participatory_process.id
         )
       end
 
@@ -32,7 +32,7 @@ module Decidim
       end
 
       def feature
-        @feature ||= participatory_process.features.find(params[:feature_id])
+        @feature ||= current_participatory_process.features.find(params[:feature_id])
       end
     end
   end

data/decidim-admin/app/controllers/decidim/admin/feature_permissions_controller.rb

@@ -24,7 +24,7 @@ module Decidim
         UpdateFeaturePermissions.call(@permissions_form, feature) do
           on(:ok) do
             flash[:notice] = t("feature_permissions.update.success", scope: "decidim.admin")
-            redirect_to participatory_process_features_path(participatory_process)
+            redirect_to participatory_process_features_path(current_participatory_process)
           end
 
           on(:invalid) do
@@ -53,7 +53,7 @@ module Decidim
       end
 
       def feature
-        @feature ||= participatory_process.features.find(params[:feature_id])
+        @feature ||= current_participatory_process.features.find(params[:feature_id])
       end
     end
   end

data/decidim-admin/app/controllers/decidim/admin/features/base_controller.rb

@@ -13,7 +13,6 @@ module Decidim
         helper Decidim::Admin::ExportsHelper
 
         helper_method :current_feature,
-                      :current_participatory_process,
                       :parent_path
 
         delegate :active_step, to: :current_participatory_process, prefix: false
@@ -30,10 +29,6 @@ module Decidim
           request.env["decidim.current_feature"]
         end
 
-        def current_participatory_process
-          request.env["decidim.current_participatory_process"]
-        end
-
         def parent_path
           decidim_admin.participatory_process_features_path(current_participatory_process)
         end

data/decidim-admin/app/controllers/decidim/admin/features_controller.rb

@@ -15,7 +15,7 @@ module Decidim
       def index
         authorize! :read, Feature
         @manifests = Decidim.feature_manifests
-        @features = participatory_process.features
+        @features = current_participatory_process.features
       end
 
       def new
@@ -24,7 +24,7 @@ module Decidim
         @feature = Feature.new(
           name: default_name(manifest),
           manifest_name: params[:type],
-          participatory_process: participatory_process
+          participatory_process: current_participatory_process
         )
 
         @form = form(FeatureForm).from_model(@feature)
@@ -34,7 +34,7 @@ module Decidim
         @form = form(FeatureForm).from_params(params)
         authorize! :create, Feature
 
-        CreateFeature.call(manifest, @form, participatory_process) do
+        CreateFeature.call(manifest, @form, current_participatory_process) do
           on(:ok) do
             flash[:notice] = I18n.t("features.create.success", scope: "decidim.admin")
             redirect_to action: :index
@@ -112,7 +112,7 @@ module Decidim
       private
 
       def query_scope
-        participatory_process.features
+        current_participatory_process.features
       end
 
       def manifest

data/decidim-admin/app/controllers/decidim/admin/moderations_controller.rb

@@ -61,7 +61,7 @@ module Decidim
       end
 
       def participatory_process_moderations
-        @participatory_process_moderations ||= Decidim::Moderation.where(participatory_process: participatory_process)
+        @participatory_process_moderations ||= Decidim::Moderation.where(participatory_process: current_participatory_process)
       end
     end
   end

data/decidim-admin/app/controllers/decidim/admin/participatory_process_attachments_controller.rb

@@ -12,11 +12,11 @@ module Decidim
       include Concerns::HasAttachments
 
       def after_destroy_path
-        participatory_process_attachments_path(participatory_process.id)
+        participatory_process_attachments_path(current_participatory_process.id)
       end
 
       def attached_to
-        participatory_process
+        current_participatory_process
       end
 
       def authorization_object

data/decidim-admin/app/controllers/decidim/admin/participatory_process_copies_controller.rb

@@ -9,18 +9,16 @@ module Decidim
     class ParticipatoryProcessCopiesController < ApplicationController
       include Concerns::ParticipatoryProcessAdmin
 
-      helper_method :participatory_process
-
       def new
         authorize! :new, Decidim::ParticipatoryProcess
-        @form = form(ParticipatoryProcessCopyForm).from_model(participatory_process)
+        @form = form(ParticipatoryProcessCopyForm).from_model(current_participatory_process)
       end
 
       def create
         authorize! :create, Decidim::ParticipatoryProcess
         @form = form(ParticipatoryProcessCopyForm).from_params(params)
 
-        CopyParticipatoryProcess.call(@form, participatory_process) do
+        CopyParticipatoryProcess.call(@form, current_participatory_process) do
           on(:ok) do
             flash[:notice] = I18n.t("participatory_processes_copies.create.success", scope: "decidim.admin")
             redirect_to participatory_processes_path
@@ -36,11 +34,7 @@ module Decidim
       private
 
       def collection
-        @collection ||= ManageableParticipatoryProcessesForUser.for(current_user)
-      end
-
-      def participatory_process
-        @participatory_process ||= collection.find(params[:participatory_process_id])
+        @collection ||= Decidim::ParticipatoryProcessesWithUserRole.for(current_user, :admin)
       end
     end
   end

data/decidim-admin/app/controllers/decidim/admin/participatory_process_publications_controller.rb

@@ -10,9 +10,9 @@ module Decidim
       include Concerns::ParticipatoryProcessAdmin
 
       def create
-        authorize! :publish, participatory_process
+        authorize! :publish, current_participatory_process
 
-        PublishParticipatoryProcess.call(participatory_process) do
+        PublishParticipatoryProcess.call(current_participatory_process) do
           on(:ok) do
             flash[:notice] = I18n.t("participatory_process_publications.create.success", scope: "decidim.admin")
           end
@@ -26,9 +26,9 @@ module Decidim
       end
 
       def destroy
-        authorize! :publish, participatory_process
+        authorize! :publish, current_participatory_process
 
-        UnpublishParticipatoryProcess.call(participatory_process) do
+        UnpublishParticipatoryProcess.call(current_participatory_process) do
           on(:ok) do
             flash[:notice] = I18n.t("participatory_process_publications.destroy.success", scope: "decidim.admin")
           end

data/decidim-admin/app/controllers/decidim/admin/participatory_process_step_activations_controller.rb

@@ -21,7 +21,7 @@ module Decidim
             flash.now[:alert] = I18n.t("participatory_process_step_activations.create.error", scope: "decidim.admin")
           end
 
-          redirect_to participatory_process_steps_path(participatory_process)
+          redirect_to participatory_process_steps_path(current_participatory_process)
         end
       end
 
@@ -32,7 +32,7 @@ module Decidim
       end
 
       def collection
-        participatory_process.steps
+        current_participatory_process.steps
       end
     end
   end

data/decidim-admin/app/controllers/decidim/admin/participatory_process_step_ordering_controller.rb

@@ -14,7 +14,7 @@ module Decidim
         ReorderParticipatoryProcessSteps.call(collection, params[:items_ids]) do
           on(:invalid) do
             flash.now[:alert] = I18n.t("participatory_process_steps.ordering.error", scope: "decidim.admin")
-            redirect_to participatory_process_path(participatory_process)
+            redirect_to participatory_process_path(current_participatory_process)
           end
         end
       end
@@ -22,7 +22,7 @@ module Decidim
       private
 
       def collection
-        participatory_process.steps
+        current_participatory_process.steps
       end
     end
   end

data/decidim-admin/app/controllers/decidim/admin/participatory_process_steps_controller.rb

@@ -22,10 +22,10 @@ module Decidim
         authorize! :create, Decidim::ParticipatoryProcessStep
         @form = form(ParticipatoryProcessStepForm).from_params(params)
 
-        CreateParticipatoryProcessStep.call(@form, participatory_process) do
+        CreateParticipatoryProcessStep.call(@form, current_participatory_process) do
           on(:ok) do
             flash[:notice] = I18n.t("participatory_process_steps.create.success", scope: "decidim.admin")
-            redirect_to participatory_process_steps_path(participatory_process)
+            redirect_to participatory_process_steps_path(current_participatory_process)
           end
 
           on(:invalid) do
@@ -49,7 +49,7 @@ module Decidim
         UpdateParticipatoryProcessStep.call(@participatory_process_step, @form) do
           on(:ok) do
             flash[:notice] = I18n.t("participatory_process_steps.update.success", scope: "decidim.admin")
-            redirect_to participatory_process_steps_path(participatory_process)
+            redirect_to participatory_process_steps_path(current_participatory_process)
           end
 
           on(:invalid) do
@@ -71,12 +71,12 @@ module Decidim
         DestroyParticipatoryProcessStep.call(@participatory_process_step) do
           on(:ok) do
             flash[:notice] = I18n.t("participatory_process_steps.destroy.success", scope: "decidim.admin")
-            redirect_to participatory_process_steps_path(participatory_process)
+            redirect_to participatory_process_steps_path(current_participatory_process)
           end
 
           on(:invalid) do |reason|
             flash[:alert] = I18n.t("participatory_process_steps.destroy.error.#{reason}", scope: "decidim.admin")
-            redirect_to participatory_process_steps_path(participatory_process)
+            redirect_to participatory_process_steps_path(current_participatory_process)
           end
         end
       end
@@ -84,7 +84,7 @@ module Decidim
       private
 
       def collection
-        @collection ||= participatory_process.steps
+        @collection ||= current_participatory_process.steps
       end
     end
   end

data/decidim-admin/app/controllers/decidim/admin/participatory_process_user_roles_controller.rb

@@ -9,22 +9,21 @@ module Decidim
     class ParticipatoryProcessUserRolesController < ApplicationController
       include Concerns::ParticipatoryProcessAdmin
 
-      helper_method :participatory_process, :process_admin_roles
-
       def index
-        authorize! :read, Decidim::Admin::ParticipatoryProcessUserRole
+        authorize! :read, Decidim::ParticipatoryProcessUserRole
+        @participatory_process_user_roles = collection
       end
 
       def new
-        authorize! :create, Decidim::Admin::ParticipatoryProcessUserRole
+        authorize! :create, Decidim::ParticipatoryProcessUserRole
         @form = form(ParticipatoryProcessUserRoleForm).instance
       end
 
       def create
-        authorize! :create, Decidim::Admin::ParticipatoryProcessUserRole
+        authorize! :create, Decidim::ParticipatoryProcessUserRole
         @form = form(ParticipatoryProcessUserRoleForm).from_params(params)
 
-        CreateParticipatoryProcessAdmin.call(@form, current_user, participatory_process) do
+        CreateParticipatoryProcessAdmin.call(@form, current_user, current_participatory_process) do
           on(:ok) do
             flash[:notice] = I18n.t("participatory_process_user_roles.create.success", scope: "decidim.admin")
           end
@@ -32,14 +31,14 @@ module Decidim
           on(:invalid) do
             flash[:alert] = I18n.t("participatory_process_user_roles.create.error", scope: "decidim.admin")
           end
-          redirect_to participatory_process_user_roles_path(participatory_process)
+          redirect_to participatory_process_user_roles_path(current_participatory_process)
         end
       end
 
       def edit
         @user_role = collection.find(params[:id])
         authorize! :update, @user_role
-        @form = form(ParticipatoryProcessUserRoleForm).from_model(@user_role.user, current_process: participatory_process)
+        @form = form(ParticipatoryProcessUserRoleForm).from_model(@user_role.user, current_process: current_participatory_process)
       end
 
       def update
@@ -50,7 +49,7 @@ module Decidim
         UpdateParticipatoryProcessAdmin.call(@form, @user_role) do
           on(:ok) do
             flash[:notice] = I18n.t("participatory_process_user_roles.update.success", scope: "decidim.admin")
-            redirect_to participatory_process_user_roles_path(participatory_process)
+            redirect_to participatory_process_user_roles_path(current_participatory_process)
           end
 
           on(:invalid) do
@@ -84,17 +83,16 @@ module Decidim
           end
         end
 
-        redirect_to participatory_process_user_roles_path(participatory_process)
+        redirect_to participatory_process_user_roles_path(current_participatory_process)
       end
 
       private
 
       def collection
-        @collection ||= ProcessAdminRolesForProcess.for(participatory_process)
-      end
-
-      def process_admin_roles
-        @process_admin_roles ||= ProcessAdminRolesForProcess.for(@participatory_process)
+        @collection ||= Decidim::ParticipatoryProcessUserRole
+                        .includes(:user)
+                        .where(participatory_process: current_participatory_process)
+                        .order(:role, "decidim_users.name")
       end
     end
   end

data/decidim-admin/app/controllers/decidim/admin/participatory_processes_controller.rb

@@ -7,8 +7,8 @@ module Decidim
     # Controller that allows managing participatory processes.
     #
     class ParticipatoryProcessesController < ApplicationController
-      helper_method :participatory_process
       helper Decidim::OrganizationScopesHelper
+      helper_method :current_participatory_process
 
       def index
         authorize! :index, Decidim::ParticipatoryProcess
@@ -38,18 +38,16 @@ module Decidim
       end
 
       def edit
-        @participatory_process = collection.find(params[:id])
-        authorize! :update, @participatory_process
-        @form = form(ParticipatoryProcessForm).from_model(@participatory_process)
+        authorize! :update, current_participatory_process
+        @form = form(ParticipatoryProcessForm).from_model(current_participatory_process)
         render layout: "decidim/admin/participatory_process"
       end
 
       def update
-        @participatory_process = collection.find(params[:id])
-        authorize! :update, @participatory_process
+        authorize! :update, current_participatory_process
         @form = form(ParticipatoryProcessForm).from_params(participatory_process_params)
 
-        UpdateParticipatoryProcess.call(@participatory_process, @form) do
+        UpdateParticipatoryProcess.call(current_participatory_process, @form) do
           on(:ok) do |participatory_process|
             flash[:notice] = I18n.t("participatory_processes.update.success", scope: "decidim.admin")
             redirect_to edit_participatory_process_path(participatory_process)
@@ -63,14 +61,12 @@ module Decidim
       end
 
       def show
-        @participatory_process = collection.find(params[:id])
-        authorize! :read, @participatory_process
+        authorize! :read, current_participatory_process
       end
 
       def destroy
-        @participatory_process = collection.find(params[:id])
-        authorize! :destroy, @participatory_process
-        @participatory_process.destroy!
+        authorize! :destroy, current_participatory_process
+        current_participatory_process.destroy!
 
         flash[:notice] = I18n.t("participatory_processes.destroy.success", scope: "decidim.admin")
 
@@ -78,22 +74,24 @@ module Decidim
       end
 
       def copy
-        @participatory_process ||= collection.find(params[:id])
+        authorize! :create, Decidim::ParticipatoryProcess
       end
 
-      private
+      def current_participatory_process
+        @current_participatory_process ||= collection.find(params[:id]) if params[:id]
+      end
 
-      attr_reader :participatory_process
+      private
 
       def collection
-        @collection ||= ManageableParticipatoryProcessesForUser.for(current_user)
+        @collection ||= Decidim::ParticipatoryProcessesWithUserRole.for(current_user)
       end
 
       def participatory_process_params
         {
           id: params[:id],
-          hero_image: @participatory_process.hero_image,
-          banner_image: @participatory_process.banner_image
+          hero_image: current_participatory_process.hero_image,
+          banner_image: current_participatory_process.banner_image
         }.merge(params[:participatory_process].to_unsafe_h)
       end
     end

data/decidim-admin/app/controllers/decidim/admin/users_controller.rb

@@ -14,7 +14,7 @@ module Decidim
 
       def new
         authorize! :new, :admin_users
-        @form = form(InviteAdminForm).instance
+        @form = form(InviteUserForm).instance
       end
 
       def create
@@ -23,13 +23,13 @@ module Decidim
         default_params = {
           organization: current_organization,
           invitation_instructions: "invite_admin",
-          roles: %w(admin),
+          admin: true,
           invited_by: current_user,
           comments_notifications: true,
           replies_notifications: true
         }
 
-        @form = form(InviteAdminForm).from_params(params.merge(default_params))
+        @form = form(InviteUserForm).from_params(params.merge(default_params))
 
         InviteUser.call(@form) do
           on(:ok) do
@@ -63,7 +63,7 @@ module Decidim
       def destroy
         authorize! :destroy, :admin_users
 
-        RemoveUserRole.call(user, "admin") do
+        RemoveAdmin.call(user) do
           on(:ok) do
             flash[:notice] = I18n.t("users.destroy.success", scope: "decidim.admin")
           end