decidim-admin 0.4.0 → 0.4.1

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

data/app/forms/decidim/admin/participatory_process_user_role_form.rb

@@ -14,10 +14,10 @@ module Decidim
 
       validates :email, :role, presence: true
       validates :name, presence: true
-      validates :role, inclusion: { in: ParticipatoryProcessUserRole::ROLES }
+      validates :role, inclusion: { in: Decidim::ParticipatoryProcessUserRole::ROLES }
 
       def roles
-        Decidim::Admin::ParticipatoryProcessUserRole::ROLES.map do |role|
+        Decidim::ParticipatoryProcessUserRole::ROLES.map do |role|
           [
             I18n.t(role, scope: "decidim.admin.models.participatory_process_user_role.roles"),
             role

data/app/models/decidim/admin/abilities/{admin_user.rb → admin_ability.rb}

@@ -5,11 +5,9 @@ module Decidim
     module Abilities
       # Defines the abilities for a user in the admin section. Intended to be
       # used with `cancancan`.
-      class AdminUser
-        include CanCan::Ability
-
-        def initialize(user, _context)
-          return unless user && user.role?(:admin)
+      class AdminAbility < Decidim::Abilities::AdminAbility
+        def define_abilities
+          super
 
           can :manage, ParticipatoryProcess
           can :manage, ParticipatoryProcessGroup
@@ -27,7 +25,6 @@ module Decidim
           end
 
           can :manage, Feature
-          can :read, :admin_dashboard
           can :manage, :admin_users
           can :manage, Moderation
           can :manage, Attachment

data/app/models/decidim/admin/abilities/{base.rb → base_ability.rb}

@@ -7,13 +7,10 @@ module Decidim
       # used with `cancancan`. Extended by both the base `Decidim::Ability`
       # class and other engine-only abilities, like the
       # `ParticipatoryProcessAdmin` ability class.
-      class Base
+      class BaseAbility
         include CanCan::Ability
 
         def initialize(user, context)
-          merge ::Decidim::Ability.new(user, context)
-          merge ParticipatoryProcessAdmin.new(user, context)
-
           Decidim.admin_abilities.each do |ability|
             merge ability.constantize.new(user, context)
           end

data/app/models/decidim/admin/abilities/{participatory_process_admin.rb → participatory_process_admin_ability.rb}

@@ -9,55 +9,45 @@ module Decidim
       # Admin engine.
       #
       # This ability will not apply to organization admins.
-      class ParticipatoryProcessAdmin
-        include CanCan::Ability
-
-        def initialize(user, _context)
-          @user = user
-
-          return unless user && !user.role?(:admin) && !user.role?(:collaborator)
-
-          can :read, :admin_dashboard do
-            participatory_processes.any?
-          end
+      class ParticipatoryProcessAdminAbility < Decidim::Abilities::ParticipatoryProcessAdminAbility
+        def define_abilities
+          super
 
           can :manage, ParticipatoryProcess do |process|
-            participatory_processes.include?(process)
+            can_manage_process?(process)
           end
 
           cannot :create, ParticipatoryProcess
           cannot :destroy, ParticipatoryProcess
+        end
 
-          cannot :manage, :admin_users
+        def define_participatory_process_abilities
+          super
 
-          can :manage, ParticipatoryProcessUserRole do |role|
-            role.user != user
+          can :manage, Feature do |feature|
+            can_manage_process?(feature.participatory_process)
           end
 
-          can :manage, Moderation do |moderation|
-            participatory_processes.include?(moderation.participatory_process)
+          can :manage, Category do |category|
+            can_manage_process?(category.participatory_process)
           end
 
           can :manage, Attachment do |attachment|
-            participatory_processes.include?(attachment.attached_to)
+            attachment.attached_to.is_a?(Decidim::ParticipatoryProcess) && can_manage_process?(attachment.attached_to)
           end
 
-          can :manage, ParticipatoryProcessStep do |step|
-            participatory_processes.include?(step.participatory_process)
+          can :manage, ParticipatoryProcessUserRole do |role|
+            can_manage_process?(role.participatory_process) && role.user != @user
           end
 
-          can :manage, Feature do |feature|
-            participatory_processes.include?(feature.participatory_process)
+          can :manage, Moderation do |moderation|
+            can_manage_process?(moderation.participatory_process)
           end
 
-          can :manage, Category do |category|
-            participatory_processes.include?(category.participatory_process)
+          can :manage, ParticipatoryProcessStep do |step|
+            can_manage_process?(step.participatory_process)
           end
         end
-
-        def participatory_processes
-          @participatory_processes ||= ManageableParticipatoryProcessesForUser.for(@user)
-        end
       end
     end
   end

data/app/models/decidim/admin/abilities/participatory_process_collaborator_ability.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module Abilities
+      # Defines the abilities for a collaborator user in the admin
+      # section. Intended to be used with `cancancan`.
+      class ParticipatoryProcessCollaboratorAbility < Decidim::Abilities::ParticipatoryProcessCollaboratorAbility
+        def define_abilities
+          super
+
+          can [:read, :preview], ParticipatoryProcess do |process|
+            can_manage_process?(process)
+          end
+        end
+      end
+    end
+  end
+end

data/app/models/decidim/admin/abilities/participatory_process_moderator_ability.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module Abilities
+      # Defines the abilities for a moderator user in the admin
+      # section. Intended to be used with `cancancan`.
+      class ParticipatoryProcessModeratorAbility < Decidim::Abilities::ParticipatoryProcessModeratorAbility
+        def define_abilities
+          super
+
+          can [:read], ParticipatoryProcess do |process|
+            can_manage_process?(process)
+          end
+
+          can :manage, Moderation do |moderation|
+            can_manage_process?(moderation.participatory_process)
+          end
+        end
+      end
+    end
+  end
+end

data/app/queries/decidim/admin/process_admins.rb

@@ -35,7 +35,7 @@ module Decidim
       end
 
       def process_admins
-        Decidim::Admin::ParticipatoryProcessUserRole
+        Decidim::ParticipatoryProcessUserRole
           .where(participatory_process: process, role: :admin)
           .pluck(:decidim_user_id)
       end

data/app/views/decidim/admin/categories/index.html.erb

@@ -3,13 +3,13 @@
     <h2 class='card-title'>
       <%= t(".categories_title", scope: "decidim.admin") %>
       <% if can? :create, Decidim::Category %>
-        <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.category.name", scope: "decidim.admin")), new_participatory_process_category_path(participatory_process), class: 'button tiny button--title new' %>
+        <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.category.name", scope: "decidim.admin")), new_participatory_process_category_path(current_participatory_process), class: 'button tiny button--title new' %>
       <% end %>
     </h2>
   </div>
 
   <div class="card-section">
-     <% if participatory_process.categories.any? %>
+     <% if current_participatory_process.categories.any? %>
       <div class="table-scroll">
         <table class="table-list">
           <thead>
@@ -19,19 +19,19 @@
             </tr>
           </thead>
           <tbody>
-            <% participatory_process.categories.first_class.each do |category| %>
+            <% current_participatory_process.categories.first_class.each do |category| %>
               <tr>
                 <td>
-                  <%= link_to translated_attribute(category.name), edit_participatory_process_category_path(participatory_process, category) %><br />
+                  <%= link_to translated_attribute(category.name), edit_participatory_process_category_path(current_participatory_process, category) %><br />
                 </td>
                 <td class="table-list__actions">
                   <% if can? :update, category %>
-                    <%= icon_link_to "pencil", edit_participatory_process_category_path(participatory_process, category), t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
+                    <%= icon_link_to "pencil", edit_participatory_process_category_path(current_participatory_process, category), t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
                   <% end %>
 
                   <% if can? :destroy, category %>
                     <% if category.unused? %>
-                      <%= icon_link_to "circle-x", participatory_process_category_path(participatory_process, category), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
+                      <%= icon_link_to "circle-x", participatory_process_category_path(current_participatory_process, category), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
                     <% else %>
                       <span class="action-icon" title="<%= t('.category_used') %>" data-tooltip="true" data-disable-hover="false">
                         <%= icon "circle-x", class: "action-icon action-icon--disabled" %>
@@ -43,15 +43,15 @@
               <% category.subcategories.each do |subcategory| %>
                 <tr class="extra__table-list__subcategory">
                   <td>
-                    <%= link_to translated_attribute(subcategory.name), edit_participatory_process_category_path(participatory_process, subcategory) %><br />
+                    <%= link_to translated_attribute(subcategory.name), edit_participatory_process_category_path(current_participatory_process, subcategory) %><br />
                   </td>
                   <td class="table-list__actions">
                   <% if can? :update, subcategory %>
-                    <%= icon_link_to "pencil", edit_participatory_process_category_path(participatory_process, subcategory), t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
+                    <%= icon_link_to "pencil", edit_participatory_process_category_path(current_participatory_process, subcategory), t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
                   <% end %>
 
                   <% if can? :destroy, subcategory %>
-                    <%= icon_link_to "circle-x", participatory_process_category_path(participatory_process, subcategory), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
+                    <%= icon_link_to "circle-x", participatory_process_category_path(current_participatory_process, subcategory), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
                   <% end %>
                   </td>
                 </tr>

data/app/views/decidim/admin/categories/new.html.erb

@@ -1,4 +1,4 @@
-<%= decidim_form_for(@form, url: participatory_process_categories_path(participatory_process), html: { class: "form new_participatory_process_category" }) do |f| %>
+<%= decidim_form_for(@form, url: participatory_process_categories_path(current_participatory_process), html: { class: "form new_participatory_process_category" }) do |f| %>
   <%= render partial: 'form', object: f, locals: { title: t('.title') } %>
 
   <div class="button--double form-general-submit">

data/app/views/decidim/admin/features/_form.html.erb

@@ -35,7 +35,7 @@
               <legend><%= t ".step_settings" %></legend>
             </div>
             <div class="card-section">
-              <% participatory_process.steps.each do |step| %>
+              <% current_participatory_process.steps.each do |step| %>
                 <fieldset class="step-settings-<%= step.id %>">
                   <legend><%= step.position + 1 %>. <%= translated_attribute step.title %></legend>
                   <% step_settings = form.object.step_settings[step.id.to_s] %>

data/app/views/decidim/admin/features/edit.html.erb

@@ -1,4 +1,4 @@
-<%= decidim_form_for([participatory_process, @form], url: participatory_process_feature_path(participatory_process, @feature), method: "put", html: { class: "form edit_feature" }) do |form| %>
+<%= decidim_form_for([current_participatory_process, @form], url: participatory_process_feature_path(current_participatory_process, @feature), method: "put", html: { class: "form edit_feature" }) do |form| %>
   <%= render partial: 'form', object: form, locals: { feature: @feature, title: t(".title", name: t("#{@feature.manifest.name}.name", scope: "decidim.features"))} %>
 
   <div class="button--double form-general-submit">

data/app/views/decidim/admin/features/new.html.erb

@@ -1,5 +1,5 @@
 
-<%= decidim_form_for([participatory_process, @form], url: participatory_process_features_path(type: params[:type]), method: "post", html: { class: "form new_feature" }) do |form| %>
+<%= decidim_form_for([current_participatory_process, @form], url: participatory_process_features_path(type: params[:type]), method: "post", html: { class: "form new_feature" }) do |form| %>
   <%= render partial: 'form', object: form, locals: { feature: @feature, title: t(".title", name: t("#{manifest.name}.name", scope: "decidim.features"))} %>
 
   <div class="button--double form-general-submit">

data/app/views/decidim/admin/participatory_process_copies/new.html.erb

@@ -1,4 +1,4 @@
-<%= decidim_form_for(@form, url: participatory_process_copies_path(participatory_process), method: :post, html: { class: "form copy_participatory_process" }) do |f| %>
+<%= decidim_form_for(@form, url: participatory_process_copies_path(current_participatory_process), method: :post, html: { class: "form copy_participatory_process" }) do |f| %>
   <%= render partial: 'form', object: f, locals: { title: t('.title'), select: t('.select')} %>
 
   <div class="button--double form-general-submit">

data/app/views/decidim/admin/participatory_process_groups/index.html.erb

@@ -18,7 +18,11 @@
           <% collection.each do |group| %>
             <tr>
               <td>
-                <%= link_to translated_attribute(group.name), ['edit', group] %><br />
+                <% if can? :update, group %>
+                  <%= link_to translated_attribute(group.name), ['edit', group] %><br />
+                <% else %>
+                  <%= translated_attribute(group.name) %>
+                <% end %>
               </td>
               <td class="table-list__actions">
                 <% if can? :update, group %>

data/app/views/decidim/admin/participatory_process_steps/index.html.erb

@@ -3,14 +3,14 @@
     <h2 class="card-title">
       <%= t(".steps_title", scope: "decidim.admin") %>
       <% if can? :create, Decidim::ParticipatoryProcessStep %>
-        <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.participatory_process_step.name", scope: "decidim.admin")), new_participatory_process_step_path(participatory_process), class: 'button tiny button--title' %>
+        <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.participatory_process_step.name", scope: "decidim.admin")), new_participatory_process_step_path(current_participatory_process), class: 'button tiny button--title' %>
       <% end %>
     </h2>
   </div>
 
   <div class="card-section">
     <div class="table-scroll">
-      <% if participatory_process.steps.any? %>
+      <% if current_participatory_process.steps.any? %>
         <table class="table-list">
           <thead>
             <tr>
@@ -20,15 +20,15 @@
               <th class="actions"></th>
             </tr>
           </thead>
-          <tbody class="sortable" data-sort-url="<%= ordering_participatory_process_steps_path(participatory_process) %>">
-            <% participatory_process.steps.each do |step| %>
+          <tbody class="sortable" data-sort-url="<%= ordering_participatory_process_steps_path(current_participatory_process) %>">
+            <% current_participatory_process.steps.each do |step| %>
               <tr data-id="<%= step.id %>">
                 <td>
-                  <span class="table-list__actions"><%= icon("move", class: "action-icon") %></span>                
+                  <span class="table-list__actions"><%= icon("move", class: "action-icon") %></span>
                   <% if step.active? %>
                     <span class="icon-active"></span>
                   <% end %>
-                  <%= link_to translated_attribute(step.title), edit_participatory_process_step_path(participatory_process, step) %><br />
+                  <%= link_to translated_attribute(step.title), edit_participatory_process_step_path(current_participatory_process, step) %><br />
                 </td>
                 <td>
                   <% if step.start_date %>
@@ -42,15 +42,15 @@
                 </td>
                 <td class="table-list__actions">
                   <% if can?(:activate, step) && !step.active? %>
-                    <%= icon_link_to "circle-check", participatory_process_step_activate_path(participatory_process, step), t("actions.activate", scope: "decidim.admin"), class: "action-icon--activate", method: :post %>
+                    <%= icon_link_to "circle-check", participatory_process_step_activate_path(current_participatory_process, step), t("actions.activate", scope: "decidim.admin"), class: "action-icon--activate", method: :post %>
                   <% end %>
 
                   <% if can? :update, step %>
-                    <%= icon_link_to "pencil", edit_participatory_process_step_path(participatory_process, step), t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
+                    <%= icon_link_to "pencil", edit_participatory_process_step_path(current_participatory_process, step), t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
                   <% end %>
 
                   <% if can? :destroy, step %>
-                    <%= icon_link_to "circle-x", participatory_process_step_path(participatory_process, step), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
+                    <%= icon_link_to "circle-x", participatory_process_step_path(current_participatory_process, step), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
                   <% end %>
                 </td>
               </tr>