decidim-admin 0.4.0 → 0.4.1

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

@@ -2,8 +2,8 @@
   <div class="card-divider">
     <h2 class="card-title">
       <%= t(".process_admins_title", scope: "decidim.admin") %>
-      <% if can? :create, Decidim::Admin::ParticipatoryProcessUserRole %>
-         <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.participatory_process_user_role.name", scope: "decidim.admin")), new_participatory_process_user_role_path(participatory_process), class: 'button tiny button--title new' %>
+      <% if can? :create, Decidim::ParticipatoryProcessUserRole %>
+         <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.participatory_process_user_role.name", scope: "decidim.admin")), new_participatory_process_user_role_path(current_participatory_process), class: 'button tiny button--title new' %>
       <% end %>
     </h2>
   </div>
@@ -22,7 +22,7 @@
           </tr>
         </thead>
         <tbody>
-          <% process_admin_roles.each do |role| %>
+          <% @participatory_process_user_roles.each do |role| %>
             <tr>
               <td>
                 <%= role.user.name %><br />
@@ -45,15 +45,15 @@
               </td>
               <td class="table-list__actions">
                 <% if can?(:invite, role) && role.user.invited_to_sign_up? %>
-                  <%= icon_link_to "reload", resend_invitation_participatory_process_user_role_path(participatory_process, role), t("actions.resend_invitation", scope: "decidim.admin"), class: "resend-invitation", method: :post %>
+                  <%= icon_link_to "reload", resend_invitation_participatory_process_user_role_path(current_participatory_process, role), t("actions.resend_invitation", scope: "decidim.admin"), class: "resend-invitation", method: :post %>
                 <% end %>
 
                 <% if can? :update, role %>
-                  <%= icon_link_to "pencil", edit_participatory_process_user_role_path(participatory_process, role), t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
+                  <%= icon_link_to "pencil", edit_participatory_process_user_role_path(current_participatory_process, role), t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
                 <% end %>
 
                 <% if can? :destroy, role %>
-                  <%= icon_link_to "circle-x", participatory_process_user_role_path(participatory_process, role), 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_user_role_path(current_participatory_process, role), 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/participatory_processes/edit.html.erb

@@ -3,16 +3,16 @@
   <div class="button--double form-general-submit">
     <%= f.submit t(".update"), class: "button"  %>
 
-    <% if can? :publish, participatory_process %>
-      <% if participatory_process.published? %>
-        <%= link_to t("actions.unpublish", scope: "decidim.admin"), participatory_process_publish_path(participatory_process), method: :delete, class: "button muted" %>
+    <% if can? :publish, current_participatory_process %>
+      <% if current_participatory_process.published? %>
+        <%= link_to t("actions.unpublish", scope: "decidim.admin"), participatory_process_publish_path(current_participatory_process), method: :delete, class: "button muted" %>
       <% else %>
-        <%= link_to t("actions.publish", scope: "decidim.admin"), participatory_process_publish_path(participatory_process), method: :post, class: "button hollow" %>
+        <%= link_to t("actions.publish", scope: "decidim.admin"), participatory_process_publish_path(current_participatory_process), method: :post, class: "button hollow" %>
       <% end %>
     <% end %>
 
-    <% if can? :destroy, participatory_process %>
-      <%= link_to t("decidim.admin.actions.destroy"), participatory_process, method: :delete, class: "alert button", data: { confirm: t("decidim.admin.actions.confirm_destroy") } %>
+    <% if can? :destroy, current_participatory_process %>
+      <%= link_to t("decidim.admin.actions.destroy"), current_participatory_process, method: :delete, class: "alert button", data: { confirm: t("decidim.admin.actions.confirm_destroy") } %>
     <% end %>
   </div>
 <% end %>

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

@@ -24,7 +24,15 @@
                     <%= icon "star" %>
                   </span>
                 <% end %>
-                <%= link_to translated_attribute(process.title), edit_participatory_process_path(process) %><br />
+                <% if can? :update, process %>
+                  <%= link_to translated_attribute(process.title), edit_participatory_process_path(process) %><br />
+                <% elsif can? :preview, process %>
+                  <%= link_to translated_attribute(process.title), decidim.participatory_process_path(process) %><br />
+                <% elsif can? :read, Decidim::Moderation %>
+                  <%= link_to translated_attribute(process.title), decidim_admin.participatory_process_moderations_path(process) %><br />
+                <% else %>
+                  <%= translated_attribute(process.title) %>
+                <% end %>
               </td>
               <td>
                 <%= l process.created_at, format: :short %>
@@ -37,7 +45,9 @@
                 <% end %>
               </td>
               <td class="table-list__actions">
+                <% if can? :create, process %>
                   <%= icon_link_to "clipboard", new_participatory_process_copy_path(process), t("actions.duplicate", scope: "decidim.admin"), class: "action-icon--copy" %>
+                <% end %>
 
                 <% if can? :update, process %>
                   <%= icon_link_to "pencil", edit_participatory_process_path(process), t("actions.configure", scope: "decidim.admin"), class: "action-icon--new" %>

data/app/views/layouts/decidim/admin/participatory_process.html.erb

@@ -1,21 +1,21 @@
 <% content_for :secondary_nav do %>
   <div class="secondary-nav secondary-nav--subnav">
     <ul>
-      <% if can? :update, participatory_process %>
-        <li <% if is_active_link?(decidim_admin.edit_participatory_process_path(participatory_process)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("info", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.edit_participatory_process_path(participatory_process) %>
+      <% if can? :update, current_participatory_process %>
+        <li <% if is_active_link?(decidim_admin.edit_participatory_process_path(current_participatory_process)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to t("info", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.edit_participatory_process_path(current_participatory_process) %>
         </li>
       <% end %>
       <% if can? :read, Decidim::ParticipatoryProcessStep %>
-        <li <% if is_active_link?(decidim_admin.participatory_process_steps_path(participatory_process)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("steps", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.participatory_process_steps_path(participatory_process) %>
+        <li <% if is_active_link?(decidim_admin.participatory_process_steps_path(current_participatory_process)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to t("steps", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.participatory_process_steps_path(current_participatory_process) %>
         </li>
       <% end %>
       <% if can? :read, Decidim::Feature %>
-        <li <% if is_active_link?(decidim_admin.participatory_process_features_path(participatory_process)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("features", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.participatory_process_features_path(participatory_process) %>
+        <li <% if is_active_link?(decidim_admin.participatory_process_features_path(current_participatory_process)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to t("features", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.participatory_process_features_path(current_participatory_process) %>
           <ul>
-            <% participatory_process.features.each do |feature| %>
+            <% current_participatory_process.features.each do |feature| %>
               <% if feature.manifest.admin_engine %>
                 <li <% if is_active_link?(manage_feature_path(feature)) %> class="is-active" <% end %>>
                   <%= link_to manage_feature_path(feature) do %>
@@ -31,23 +31,23 @@
         </li>
       <% end %>
       <% if can? :read, Decidim::Category %>
-        <li <% if is_active_link?(decidim_admin.participatory_process_categories_path(participatory_process)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("categories", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.participatory_process_categories_path(participatory_process) %>
+        <li <% if is_active_link?(decidim_admin.participatory_process_categories_path(current_participatory_process)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to t("categories", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.participatory_process_categories_path(current_participatory_process) %>
         </li>
       <% end %>
       <% if can? :read, Decidim::Attachment %>
-        <li <% if is_active_link?(decidim_admin.participatory_process_attachments_path(participatory_process.id)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("attachments", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.participatory_process_attachments_path(participatory_process.id) %>
+        <li <% if is_active_link?(decidim_admin.participatory_process_attachments_path(current_participatory_process.id)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to t("attachments", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.participatory_process_attachments_path(current_participatory_process.id) %>
         </li>
       <% end %>
-      <% if can? :read, Decidim::Admin::ParticipatoryProcessUserRole %>
-        <li <% if is_active_link?(decidim_admin.participatory_process_user_roles_path(participatory_process)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("process_admins", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.participatory_process_user_roles_path(participatory_process) %>
+      <% if can? :read, Decidim::ParticipatoryProcessUserRole %>
+        <li <% if is_active_link?(decidim_admin.participatory_process_user_roles_path(current_participatory_process)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to t("process_admins", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.participatory_process_user_roles_path(current_participatory_process) %>
         </li>
       <% end %>
       <% if can? :read, Decidim::Moderation %>
-        <li <% if is_active_link?(decidim_admin.participatory_process_moderations_path(participatory_process.id)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("moderations", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.participatory_process_moderations_path(participatory_process.id) %>
+        <li <% if is_active_link?(decidim_admin.participatory_process_moderations_path(current_participatory_process.id)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to t("moderations", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.participatory_process_moderations_path(current_participatory_process.id) %>
         </li>
       <% end %>
     </ul>
@@ -57,7 +57,7 @@
 <%= render "layouts/decidim/admin/application" do %>
   <div class="process-title">
     <div class="process-title-content">
-      <%= translated_attribute(participatory_process.title) %>
+      <%= translated_attribute(current_participatory_process.title) %>
     </div>
   </div>
   <%= yield %>

data/config/locales/ca.yml

@@ -150,7 +150,7 @@ ca:
           error: S'ha produït un error en crear aquesta categoria.
           success: Categoria creada correctament.
         destroy:
-          error: S'ha produït un error en eliminar aquesta categoria. Si us plau, elimini qualsevol subcategoria en primer lloc, assegureu-vos que cap altra entitat pertany a aquesta categoria i torni a intentar-ho.
+          error: S'ha produït un error en eliminar aquesta categoria. Si us plau, elimina qualsevol subcategoria en primer lloc, assegura't que cap altra entitat pertany a aquesta categoria i torna a intentar-ho.
           success: Categoria eliminada correctament.
         edit:
           title: Edita categoria
@@ -281,6 +281,7 @@ ca:
           roles:
             admin: Administrador
             collaborator: Col·laborador
+            moderator: Moderador
         scope:
           fields:
             created_at: Data de creació
@@ -331,13 +332,13 @@ ca:
         form:
           interpolations_hint: 'Consell: Podeu utilitzar "%{name}" en qualsevol part del cos o assumpte i serà reemplaçat pel nom del destinatari.'
         index:
-          confirm_delete: Esteu segur que voleu suprimir aquest butlletí?
+          confirm_delete: Segur que vols suprimir aquest butlletí?
           title: Butlletins
         new:
           save: Desar
           title: Nou butlletí
         show:
-          confirm_deliver: Estàs segur de que vols enviar aquest butlletí? Aquesta acció no es pot desfer.
+          confirm_deliver: Segur que vols enviar aquest butlletí? Aquesta acció no es pot desfer.
           deliver: Enviar butlletí
           preview: Previsualitzar
           subject: Assumpte

data/config/locales/en.yml

@@ -282,6 +282,7 @@ en:
           roles:
             admin: Administrator
             collaborator: Collaborator
+            moderator: Moderator
         scope:
           fields:
             created_at: Created at

data/config/locales/es.yml

@@ -281,6 +281,7 @@ es:
           roles:
             admin: Administrador
             collaborator: Colaborador
+            moderator: Moderador
         scope:
           fields:
             created_at: Fecha de creación
@@ -553,8 +554,6 @@ es:
     participatory_processes:
       participatory_process_groups:
         none: Ninguno
-  forms:
-    required: Obligatorio
   layouts:
     decidim:
       admin:

data/db/migrate/20170714083651_rename_participatory_process_user_roles_table.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RenameParticipatoryProcessUserRolesTable < ActiveRecord::Migration[5.1]
+  def change
+    rename_table :decidim_admin_participatory_process_user_roles, :decidim_participatory_process_user_roles
+  end
+end

data/lib/decidim/admin/engine.rb

@@ -13,8 +13,6 @@ require "foundation_rails_helper"
 require "autoprefixer-rails"
 require "rectify"
 
-require_dependency File.join(__dir__, "..", "..", "..", "app/models/decidim/admin/abilities/admin_user")
-
 module Decidim
   module Admin
     # Decidim's core Rails Engine.
@@ -33,9 +31,12 @@ module Decidim
 
       initializer "decidim_admin.inject_abilities_to_user" do |_app|
         Decidim.configure do |config|
-          config.abilities += ["Decidim::Admin::Abilities::AdminUser"]
-          config.abilities += ["Decidim::Admin::Abilities::ParticipatoryProcessAdmin"]
-          config.abilities += ["Decidim::Admin::Abilities::CollaboratorUser"]
+          config.admin_abilities += [
+            "Decidim::Admin::Abilities::AdminAbility",
+            "Decidim::Admin::Abilities::ParticipatoryProcessAdminAbility",
+            "Decidim::Admin::Abilities::ParticipatoryProcessCollaboratorAbility",
+            "Decidim::Admin::Abilities::ParticipatoryProcessModeratorAbility"
+          ]
         end
       end
 
@@ -57,7 +58,8 @@ module Decidim
                     decidim_admin.participatory_process_groups_path,
                     icon_name: "layers",
                     position: 3,
-                    active: :inclusive
+                    active: :inclusive,
+                    if: can?(:read, Decidim::ParticipatoryProcessGroup)
 
           menu.item I18n.t("menu.static_pages", scope: "decidim.admin"),
                     decidim_admin.static_pages_path,

data/lib/decidim/admin/test/factories.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 FactoryGirl.define do
-  factory :participatory_process_user_role, class: Decidim::Admin::ParticipatoryProcessUserRole do
+  factory :participatory_process_user_role, class: Decidim::ParticipatoryProcessUserRole do
     user
     participatory_process
     role "admin"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-admin
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2017-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -158,14 +158,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
 description: Organization administration to manage a single organization.
 email:
 - josepjaume@gmail.com
@@ -333,14 +333,12 @@ files:
 - app/jobs/decidim/admin/newsletter_delivery_job.rb
 - app/jobs/decidim/admin/newsletter_job.rb
 - app/mailers/decidim/admin/application_mailer.rb
-- app/models/decidim/admin/abilities/admin_user.rb
-- app/models/decidim/admin/abilities/base.rb
-- app/models/decidim/admin/abilities/collaborator_user.rb
-- app/models/decidim/admin/abilities/participatory_process_admin.rb
+- app/models/decidim/admin/abilities/admin_ability.rb
+- app/models/decidim/admin/abilities/base_ability.rb
+- app/models/decidim/admin/abilities/participatory_process_admin_ability.rb
+- app/models/decidim/admin/abilities/participatory_process_collaborator_ability.rb
+- app/models/decidim/admin/abilities/participatory_process_moderator_ability.rb
 - app/models/decidim/admin/application_record.rb
-- app/models/decidim/admin/participatory_process_user_role.rb
-- app/queries/decidim/admin/manageable_participatory_processes_for_user.rb
-- app/queries/decidim/admin/process_admin_roles_for_process.rb
 - app/queries/decidim/admin/process_admins.rb
 - app/queries/decidim/admin/user_groups_evaluation.rb
 - app/views/decidim/admin/attachments/_form.html.erb
@@ -434,7 +432,7 @@ files:
 - config/routes.rb
 - db/migrate/20161102144648_add_admin_participatory_process_user_roles.rb
 - db/migrate/20170128112958_change_user_groups_verified_to_timestamp.rb
-- db/seeds.rb
+- db/migrate/20170714083651_rename_participatory_process_user_roles_table.rb
 - lib/decidim/admin.rb
 - lib/decidim/admin/engine.rb
 - lib/decidim/admin/features.rb

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

@@ -1,20 +0,0 @@
-# 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 CollaboratorUser
-        include CanCan::Ability
-
-        def initialize(user, _context)
-          return unless user && user.role?(:collaborator)
-
-          can :manage, :admin_dashboard
-          can :preview, ParticipatoryProcess
-        end
-      end
-    end
-  end
-end

data/app/models/decidim/admin/participatory_process_user_role.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Admin
-    # Defines a relation between a user and a participatory process, and what
-    # kind of relation does the user has.
-    class ParticipatoryProcessUserRole < ApplicationRecord
-      belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User", optional: true
-      belongs_to :participatory_process, foreign_key: "decidim_participatory_process_id", class_name: "Decidim::ParticipatoryProcess", optional: true
-
-      ROLES = %w(admin collaborator).freeze
-      validates :role, inclusion: { in: ROLES }, uniqueness: { scope: [:user, :participatory_process] }
-    end
-  end
-end

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

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Admin
-    # A class used to find the ParticipatoryProcesses that the given user can
-    # manage.
-    class ManageableParticipatoryProcessesForUser < Rectify::Query
-      # Syntactic sugar to initialize the class and return the queried objects.
-      #
-      # user - a User that needs to find which processes can manage
-      def self.for(user)
-        new(user).query
-      end
-
-      # Initializes the class.
-      #
-      # user - a User that needs to find which processes can manage
-      def initialize(user)
-        @user = user
-      end
-
-      # Finds the ParticipatoryProcesses that the given user can manage.
-      #
-      # Returns an ActiveRecord::Relation.
-      def query
-        return user.organization.participatory_processes if user.role?(:admin) || user.role?(:collaborator)
-
-        ParticipatoryProcess.where(id: process_ids)
-      end
-
-      private
-
-      attr_reader :user
-
-      def process_ids
-        ParticipatoryProcessUserRole
-          .where(user: user, role: :admin)
-          .pluck(:decidim_participatory_process_id)
-      end
-    end
-  end
-end

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

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Admin
-    # A class used to find the roles of the users that can manage a given
-    # participatory process in a process admin role (that is, processs that are
-    # not organization admins).
-    class ProcessAdminRolesForProcess < Rectify::Query
-      # Syntactic sugar to initialize the class and return the queried objects.
-      #
-      # process - a process that needs to find its process admins
-      def self.for(process)
-        new(process).query
-      end
-
-      # Initializes the class.
-      #
-      # process - a process that needs to find its process admins
-      def initialize(process)
-        @process = process
-      end
-
-      # Finds the UserRoles of the users that can manage the given process.
-      #
-      # Returns an ActiveRecord::Relation.
-      def query
-        ParticipatoryProcessUserRole
-          .where(participatory_process: process, role: [:admin, :collaborator])
-      end
-
-      private
-
-      attr_reader :process
-    end
-  end
-end