decidim-assemblies 0.8.4 → 0.9.0

data/app/models/decidim/assemblies/abilities/admin/assembly_role_ability.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Abilities
+      module Admin
+        # Defines the abilities for an assembly admin user, whatever they role. Intended to be used
+        # with `cancancan`.
+        class AssemblyRoleAbility
+          include CanCan::Ability
+
+          def initialize(user, context)
+            @user = user
+            @context = context
+
+            # Define abilities if the user is not an admin and has at least one assembly to manage.
+            if not_admin? && has_manageable_assemblies?
+              define_abilities
+
+              define_assembly_abilities if current_assembly && can_manage_assembly?(current_assembly)
+            end
+          end
+
+          # Grant access to admin panel by default.
+          def define_abilities
+            can :read, :admin_dashboard
+          end
+
+          def define_assembly_abilities; end
+
+          # Abstract: A subclass must define this method returning a valid role.
+          # See ParticipatoryProcessUserRoles::ROLES for more information.
+          def role
+            raise "Needs implementation"
+          end
+
+          # Whether the user is an admin or not.
+          def not_admin?
+            @user && !@user.admin?
+          end
+
+          # Returns a collection of assemblies where the given user has the
+          # specific role privilege.
+          def assemblies_with_role_privileges
+            @assemblies ||= Decidim::Assemblies::AssembliesWithUserRole.for(@user, role)
+          end
+
+          # Whether the user has at least one assembly to manage or not.
+          def has_manageable_assemblies?
+            assemblies_with_role_privileges.any?
+          end
+
+          # Whether the user can manage the given assembly or not.
+          def can_manage_assembly?(assembly)
+            assemblies_with_role_privileges.include? assembly
+          end
+
+          def current_assembly
+            @current_assembly ||= @context[:current_participatory_space]
+          end
+        end
+      end
+    end
+  end
+end

data/app/models/decidim/assemblies/abilities/assembly_admin_ability.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Abilities
+      # Defines the abilities for an assembly admin user.
+      # Intended to be used with `cancancan`.
+      class AssemblyAdminAbility < Decidim::Assemblies::Abilities::AssemblyRoleAbility
+        def role
+          :admin
+        end
+      end
+    end
+  end
+end

data/app/models/decidim/assemblies/abilities/assembly_collaborator_ability.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Abilities
+      # Defines the abilities for an assembly collaborator user
+      # Intended to be used with `cancancan`.
+      class AssemblyCollaboratorAbility < Decidim::Assemblies::Abilities::AssemblyRoleAbility
+        def role
+          :collaborator
+        end
+      end
+    end
+  end
+end

data/app/models/decidim/assemblies/abilities/assembly_moderator_ability.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Abilities
+      # Defines the abilities for an assembly moderator user
+      # Intended to be used with `cancancan`.
+      class AssemblyModeratorAbility < Decidim::Assemblies::Abilities::AssemblyRoleAbility
+        def role
+          :moderator
+        end
+      end
+    end
+  end
+end

data/app/models/decidim/assemblies/abilities/assembly_role_ability.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Abilities
+      # Defines the abilities for any user that can manage assemblies (whatever their role).
+      # Intended to be used with `cancancan`.
+      class AssemblyRoleAbility
+        include CanCan::Ability
+
+        attr_reader :user
+
+        def initialize(user, context)
+          @user = user
+          @context = context
+
+          define_abilities if not_admin? && has_manageable_assemblies?
+        end
+
+        def define_abilities
+          can :read, :admin_dashboard
+          can :read, Assembly
+        end
+
+        private
+
+        # Whether the user is an admin or not.
+        def not_admin?
+          @user && !@user.admin?
+        end
+
+        # Abstract: A subclass must define this method returning a valid role.
+        # See ParticipatoryProcessUserRoles::ROLES for more information.
+        def role
+          raise "Needs implementation"
+        end
+
+        # Returns a collection of Participatory assemblies where the given user has the
+        # specific role privilege.
+        def assemblies_with_role_privileges
+          @assemblies ||= Decidim::Assemblies::AssembliesWithUserRole.for(@user, role)
+        end
+
+        # Whether the user has at least one assembly to manage or not.
+        def has_manageable_assemblies?
+          assemblies_with_role_privileges.any?
+        end
+      end
+    end
+  end
+end

data/app/models/decidim/assembly.rb

@@ -9,6 +9,7 @@ module Decidim
     include Decidim::Participable
     include Decidim::Publicable
     include Decidim::Scopable
+    include Decidim::Followable
 
     belongs_to :organization,
                foreign_key: "decidim_organization_id",

data/app/models/decidim/assembly_user_role.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Defines a relation between a user and an assembly, and what kind of relation
+  # does the user have.
+  class AssemblyUserRole < ApplicationRecord
+    belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User", optional: true
+    belongs_to :assembly, foreign_key: "decidim_assembly_id", class_name: "Decidim::Assembly", optional: true
+
+    ROLES = %w(admin collaborator moderator).freeze
+    validates :role, inclusion: { in: ROLES }, uniqueness: { scope: [:user, :assembly] }
+    validate :user_and_assembly_same_organization
+
+    private
+
+    # Private: check if the process and the user have the same organization
+    def user_and_assembly_same_organization
+      return if !assembly || !user
+      errors.add(:assembly, :invalid) unless user.organization == assembly.organization
+    end
+  end
+end

data/app/queries/decidim/assemblies/assemblies_with_user_role.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    # A class used to find the Assemblies that the given user has
+    # the specific role privilege.
+    class AssembliesWithUserRole < Rectify::Query
+      # Syntactic sugar to initialize the class and return the queried objects.
+      #
+      # user - a User that needs to find which assemblies can manage
+      # role - (optional) a Symbol to specify the role privilege
+      def self.for(user, role = :any)
+        new(user, role).query
+      end
+
+      # Initializes the class.
+      #
+      # user - a User that needs to find which assemblies can manage
+      # role - (optional) a Symbol to specify the role privilege
+      def initialize(user, role = :any)
+        @user = user
+        @role = role
+      end
+
+      # Finds the Assemblies that the given user has role privileges.
+      # If the special role ':any' is provided it returns all assemblies where
+      # the user has some kind of role privilege.
+      #
+      # Returns an ActiveRecord::Relation.
+      def query
+        # Admin users have all role privileges for all organization assemblies
+        return Assemblies::OrganizationAssemblies.new(user.organization).query if user.admin?
+
+        Assembly.where(id: assembly_ids)
+      end
+
+      private
+
+      attr_reader :user, :role
+
+      def assembly_ids
+        user_roles = AssemblyUserRole.where(user: user) if role == :any
+        user_roles = AssemblyUserRole.where(user: user, role: role) if role != :any
+        user_roles.pluck(:decidim_assembly_id)
+      end
+    end
+  end
+end

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

@@ -72,7 +72,7 @@
     </div>
 
     <div class="row column">
-      <%= form.scopes_select :scope_id, prompt: t("decidim.scopes.global"), remote_path: decidim.scopes_search_path %>
+      <%= scopes_picker_field form, :scope_id, root: nil %>
     </div>
 
     <div class="row column">

data/app/views/decidim/assemblies/admin/assembly_user_roles/_form.html.erb

@@ -0,0 +1,22 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= title %>
+    </h2>
+  </div>
+
+  <div class="card-section">
+    <div class="row">
+      <div class="columns xlarge-4">
+        <%= form.text_field :name, readonly: @form.persisted? %>
+      </div>
+      <div class="columns xlarge-4">
+        <%= form.email_field :email, readonly: @form.persisted? %>
+      </div>
+      <div class="columns xlarge-4">
+        <%= form.label :role %>
+        <%= select :assembly_user_role, :role, @form.roles, include_blank: false %>
+      </div>
+    </div>
+  </div>
+</div>

data/app/views/decidim/assemblies/admin/assembly_user_roles/edit.html.erb

@@ -0,0 +1,7 @@
+<%= decidim_form_for(@form, url: assembly_user_role_path(@user_role.assembly, @user_role), html: { class: "form edit_assembly_user_roles" }) do |f| %>
+  <%= render partial: 'form', object: f, locals: { title: t('assembly_user_roles.edit.title', scope: "decidim.admin") } %>
+
+  <div class="button--double form-general-submit">
+  <%= f.submit t("assembly_user_roles.edit.update", scope: "decidim.admin") %>
+  </div>
+<% end %>

data/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb

@@ -0,0 +1,65 @@
+<div class='card' id="assembly_admins">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t("assembly_user_roles.index.assembly_admins_title", scope: "decidim.admin") %>
+      <% if can? :create, Decidim::AssemblyUserRole %>
+         <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.assembly_user_role.name", scope: "decidim.admin")), new_assembly_user_role_path(current_assembly), class: 'button tiny button--title new' %>
+      <% end %>
+    </h2>
+  </div>
+
+  <div class="card-section">
+    <div class="table-scroll">
+      <table class="stack">
+        <thead>
+          <tr>
+            <th><%= t("models.assembly_user_role.fields.name", scope: "decidim.admin") %></th>
+            <th><%= t("models.assembly_user_role.fields.email", scope: "decidim.admin") %></th>
+            <th><%= t("models.user.fields.invitation_sent_at", scope: "decidim.admin") %></th>
+            <th><%= t("models.user.fields.invitation_accepted_at", scope: "decidim.admin") %></th>
+            <th><%= t("models.assembly_user_role.fields.role", scope: "decidim.admin") %></th>
+            <th class="actions"></th>
+          </tr>
+        </thead>
+        <tbody>
+          <% @assembly_user_roles.each do |role| %>
+            <tr>
+              <td>
+                <%= role.user.name %><br />
+              </td>
+              <td>
+                <%= role.user.email %><br />
+              </td>
+              <td>
+                <% if role.user.invitation_sent_at %>
+                  <%= l role.user.invitation_sent_at, format: :short %>
+                <% end %>
+              </td>
+              <td>
+                <% if role.user.invitation_accepted_at %>
+                  <%= l role.user.invitation_accepted_at, format: :short %>
+                <% end %>
+              </td>
+              <td>
+                <%= t("#{role.role}", scope: "decidim.admin.models.assembly_user_role.roles") %><br />
+              </td>
+              <td class="table-list__actions">
+                <% if can?(:invite, role) && role.user.invited_to_sign_up? %>
+                  <%= icon_link_to "reload", resend_invitation_assembly_user_role_path(current_assembly, role), t("actions.resend_invitation", scope: "decidim.admin"), class: "resend-invitation", method: :post %>
+                <% end %>
+
+                <% if can? :update, role %>
+                  <%= icon_link_to "pencil", edit_assembly_user_role_path(current_assembly, role), t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
+                <% end %>
+
+                <% if can? :destroy, role %>
+                  <%= icon_link_to "circle-x", assembly_user_role_path(current_assembly, 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>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</div>

data/app/views/decidim/assemblies/admin/assembly_user_roles/new.html.erb

@@ -0,0 +1,7 @@
+<%= decidim_form_for(@form, html: { class: "form new_assembly_user_role" }) do |f| %>
+  <%= render partial: 'form', object: f, locals: { title: t('assembly_user_roles.new.title', scope: "decidim.admin") } %>
+
+  <div class="button--double form-general-submit">
+    <%= f.submit t("assembly_user_roles.new.create", scope: "decidim.admin") %>
+  </div>
+<% end %>

data/app/views/decidim/assemblies/assemblies/show.html.erb

@@ -18,6 +18,11 @@
       <%= attachments_for current_participatory_space %>
     </div>
     <div class="section columns medium-5 mediumlarge-4 large-3">
+      <div class="card extra">
+        <div class="card__content">
+          <%= render partial: "decidim/shared/follow_button", locals: { followable: current_participatory_space } %>
+        </div>
+      </div>
       <div class="card extra definition-data">
         <% if translated_attribute(current_participatory_space.meta_scope).present? %>
           <div class="definition-data__item scope">

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

@@ -1,18 +1,18 @@
 <% content_for :secondary_nav do %>
   <div class="secondary-nav secondary-nav--subnav">
     <ul>
-      <% if can? :update, current_assembly %>
-        <li <% if is_active_link?(decidim_admin_assemblies.edit_assembly_path(current_assembly)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("info", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.edit_assembly_path(current_assembly) %>
+      <% if can? :update, current_participatory_space %>
+        <li <% if is_active_link?(decidim_admin_assemblies.edit_assembly_path(current_participatory_space)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to t("info", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.edit_assembly_path(current_participatory_space) %>
         </li>
       <% end %>
       <% if can? :read, Decidim::Feature %>
-        <li <% if is_active_link?(decidim_admin_assemblies.features_path(current_assembly)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("features", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.features_path(current_assembly) %>
+        <li <% if is_active_link?(decidim_admin_assemblies.features_path(current_participatory_space)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to t("features", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.features_path(current_participatory_space) %>
           <ul>
-            <% current_assembly.features.each do |feature| %>
+            <% current_participatory_space.features.each do |feature| %>
               <% if feature.manifest.admin_engine %>
-                <li <% if is_active_link?(manage_feature_path(feature)) || is_active_link?(decidim_admin_assemblies.edit_feature_path(current_assembly, feature)) || is_active_link?(decidim_admin_assemblies.edit_feature_permissions_path(current_assembly, feature)) %> class="is-active" <% end %>>
+                <li <% if is_active_link?(manage_feature_path(feature)) || is_active_link?(decidim_admin_assemblies.edit_feature_path(current_participatory_space, feature)) || is_active_link?(decidim_admin_assemblies.edit_feature_permissions_path(current_participatory_space, feature)) %> class="is-active" <% end %>>
                   <%= link_to manage_feature_path(feature) do %>
                     <%= translated_attribute feature.name %>
                     <% if feature.primary_stat.present? %>
@@ -26,18 +26,23 @@
         </li>
       <% end %>
       <% if can? :read, Decidim::Category %>
-        <li <% if is_active_link?(decidim_admin_assemblies.categories_path(current_assembly)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("categories", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.categories_path(current_assembly) %>
+        <li <% if is_active_link?(decidim_admin_assemblies.categories_path(current_participatory_space)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to t("categories", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.categories_path(current_participatory_space) %>
         </li>
       <% end %>
       <% if can? :read, Decidim::Attachment %>
-        <li <% if is_active_link?(decidim_admin_assemblies.assembly_attachments_path(current_assembly)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("attachments", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.assembly_attachments_path(current_assembly) %>
+        <li <% if is_active_link?(decidim_admin_assemblies.assembly_attachments_path(current_participatory_space)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to t("attachments", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.assembly_attachments_path(current_participatory_space) %>
+        </li>
+      <% end %>
+      <% if can? :read, Decidim::AssemblyUserRole %>
+        <li <% if is_active_link?(decidim_admin_assemblies.assembly_user_roles_path(current_participatory_space)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to t("assembly_admins", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.assembly_user_roles_path(current_participatory_space) %>
         </li>
       <% end %>
       <% if can? :read, Decidim::Moderation %>
-        <li <% if is_active_link?(decidim_admin_assemblies.moderations_path(current_assembly)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("moderations", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.moderations_path(current_assembly) %>
+        <li <% if is_active_link?(decidim_admin_assemblies.moderations_path(current_participatory_space)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to t("moderations", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.moderations_path(current_participatory_space) %>
         </li>
       <% end %>
     </ul>
@@ -47,7 +52,7 @@
 <%= render "layouts/decidim/admin/application" do %>
   <div class="process-title">
     <div class="process-title-content">
-      <%= translated_attribute(current_assembly.title) %>
+      <%= translated_attribute(current_participatory_space.title) %>
     </div>
   </div>
   <%= yield %>

data/config/locales/ca.yml

@@ -1,4 +1,3 @@
----
 ca:
   activemodel:
     attributes:
@@ -60,9 +59,27 @@ ca:
         destroy:
           error: S'ha produït un error en despublicar aquesta assemblea.
           success: Assemblea despublicada amb èxit.
+      assembly_user_roles:
+        create:
+          error: S'ha produït un error en afegir un usuari per a aquesta assamblea.
+          success: L'usuari s'ha creat correctament per a aquesta assemblea.
+        destroy:
+          success: S'ha destruït l'usuari amb èxit per a aquesta assemblea.
+        edit:
+          title: Actualitza l'usuari de l'assemblea.
+          update: Actualitza
+        index:
+          assembly_admins_title: Usuaris de l'assemblea
+        new:
+          create: Crea
+          title: Nou usuari de l'assemblea.
+        update:
+          error: S'ha produït un error en l'actualització d'un usuari per a aquesta assemblea.
+          success: L'usuari s'ha actualitzat correctament per a aquesta assemblea.
       menu:
         assemblies: Assemblees
         assemblies_submenu:
+          assembly_admins: Usuaris de l'assemblea
           attachments: Adjunts
           categories: Categories
           features: Funcionalitats
@@ -76,6 +93,16 @@ ca:
             published: Publicat
             title: Grup de processos participatius
           name: Assemblea
+        assembly_user_role:
+          fields:
+            email: Correu electrònic
+            name: Nom
+            role: Rol
+          name: Usuari de l'assemblea
+          roles:
+            admin: Administrador
+            collaborator: Col·laborador
+            moderator: Moderador
       titles:
         assemblies: Assemblees
     assemblies: