decidim-admin 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47c26318821b198a5abef8cc9514114d9be1a543
-  data.tar.gz: b78c4f9d445ee587ffc20fad6cdd935884f8ae2e
+  metadata.gz: 42620ebd8e29a49fbf096b8ae94aa58b2173cabf
+  data.tar.gz: 292d295cd03650b353e3a54fb2bc2f84bfb9dba7
 SHA512:
-  metadata.gz: dbb45517bed3f266030d3ac5ece8adc8cd387040bf34def83bc72bebde4eb6457d989ac6d591a7d42fc08264251b40a2d626a0f03c868ab6ef3af0f7b9680c20
-  data.tar.gz: 0e26714cb55d3f073cf0dbeb58584d2413016b2fbb9edd49fcf861bd9e0d2737f73a252334c2b1f853fb8c4c2b1457d9f6fe49824d05958eabc6b8b5b1d98b0c
+  metadata.gz: 574157f3e93f0b28797202df966d6ba3cea21a174caf6db438eb15b827f7c20738da96db32e9fd8d4f2bef79abf80582e8b2bdc3cb9ac1ca7630d4aea432a666
+  data.tar.gz: 3ebf17d827c28f0f4268265c58c4b188d40a39b67969758595acdbc8debe099eb7f6b217acde0725fa7622bc3e0a39a1792d640ca2145a1f9f4fb3a73daf1bb1

data/app/assets/stylesheets/decidim/admin/_variables.scss

@@ -5,3 +5,5 @@ $brand: #9675ce !default;
 $twitter: #55acee !default;
 $facebook: #3b5998 !default;
 $google: #dd4b39 !default;
+
+$secondary: #599aa6 !default;

data/app/assets/stylesheets/decidim/admin/extra/_cards.scss

@@ -4,3 +4,9 @@
     float: right;
   }
 }
+
+form {
+  .card {
+    overflow: initial;
+  }
+}

data/app/assets/stylesheets/decidim/admin/modules/_typography.scss

@@ -13,3 +13,7 @@
 .text-alert{
   color: $alert-color;
 }
+
+.text-info{
+  color: $secondary;
+}

data/app/commands/decidim/admin/create_participatory_process_admin.rb

@@ -41,7 +41,7 @@ module Decidim
       attr_reader :form, :participatory_process, :current_user, :user
 
       def create_role
-        ParticipatoryProcessUserRole.find_or_create_by!(
+        Decidim::ParticipatoryProcessUserRole.find_or_create_by!(
           role: form.role.to_sym,
           user: user,
           participatory_process: @participatory_process
@@ -68,9 +68,7 @@ module Decidim
       end
 
       def new_user
-        new_user_form = user_form.dup
-        new_user_form.roles = []
-        @new_user ||= InviteUser.call(new_user_form) do
+        @new_user ||= InviteUser.call(user_form) do
           on(:ok) do |user|
             return user
           end
@@ -81,7 +79,7 @@ module Decidim
         OpenStruct.new(name: form.name,
                        email: form.email.downcase,
                        organization: participatory_process.organization,
-                       roles: [form.role.to_sym],
+                       admin: false,
                        invited_by: current_user,
                        invitation_instructions: invitation_instructions)
       end

data/app/constraints/decidim/admin/organization_dashboard_constraint.rb

@@ -34,7 +34,7 @@ module Decidim
       end
 
       def ability
-        Decidim::Admin::Abilities::Base.new(user, current_organization: organization)
+        Decidim::Admin::Abilities::BaseAbility.new(user, current_organization: organization)
       end
     end
   end

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

@@ -33,7 +33,7 @@ module Decidim
       # Overwrites `cancancan`'s method to point to the correct ability class,
       # since the gem expects the ability class to be in the root namespace.
       def current_ability_klass
-        Decidim::Admin::Abilities::Base
+        Decidim::Admin::Abilities::BaseAbility
       end
     end
   end

data/app/controllers/decidim/admin/categories_controller.rb

@@ -15,17 +15,17 @@ module Decidim
 
       def new
         authorize! :create, Decidim::Category
-        @form = form(CategoryForm).from_params({}, current_process: participatory_process)
+        @form = form(CategoryForm).from_params({}, current_process: current_participatory_process)
       end
 
       def create
         authorize! :create, Decidim::Category
-        @form = form(CategoryForm).from_params(params, current_process: participatory_process)
+        @form = form(CategoryForm).from_params(params, current_process: current_participatory_process)
 
-        CreateCategory.call(@form, participatory_process) do
+        CreateCategory.call(@form, current_participatory_process) do
           on(:ok) do
             flash[:notice] = I18n.t("categories.create.success", scope: "decidim.admin")
-            redirect_to participatory_process_categories_path(participatory_process)
+            redirect_to participatory_process_categories_path(current_participatory_process)
           end
 
           on(:invalid) do
@@ -38,18 +38,18 @@ module Decidim
       def edit
         @category = collection.find(params[:id])
         authorize! :update, @category
-        @form = form(CategoryForm).from_model(@category, current_process: participatory_process)
+        @form = form(CategoryForm).from_model(@category, current_process: current_participatory_process)
       end
 
       def update
         @category = collection.find(params[:id])
         authorize! :update, @category
-        @form = form(CategoryForm).from_params(params, current_process: participatory_process)
+        @form = form(CategoryForm).from_params(params, current_process: current_participatory_process)
 
         UpdateCategory.call(@category, @form) do
           on(:ok) do
             flash[:notice] = I18n.t("categories.update.success", scope: "decidim.admin")
-            redirect_to participatory_process_categories_path(participatory_process)
+            redirect_to participatory_process_categories_path(current_participatory_process)
           end
 
           on(:invalid) do
@@ -77,14 +77,14 @@ module Decidim
             flash[:alert] = I18n.t("categories.destroy.error", scope: "decidim.admin")
           end
 
-          redirect_back(fallback_location: participatory_process_categories_path(participatory_process))
+          redirect_back(fallback_location: participatory_process_categories_path(current_participatory_process))
         end
       end
 
       private
 
       def collection
-        @collection ||= participatory_process.categories.includes(:subcategories)
+        @collection ||= current_participatory_process.categories.includes(:subcategories)
       end
     end
   end

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