decidim-assemblies 0.9.3 → 0.10.0

data/app/models/decidim/assembly.rb

@@ -6,17 +6,21 @@ module Decidim
   # several features (proposals, debates...) that can be enabled or disabled.
   class Assembly < ApplicationRecord
     include Decidim::HasAttachments
+    include Decidim::HasAttachmentCollections
     include Decidim::Participable
     include Decidim::Publicable
     include Decidim::Scopable
     include Decidim::Followable
+    include Decidim::HasReference
+    include Decidim::Traceable
+    include Decidim::Loggable
 
     belongs_to :organization,
                foreign_key: "decidim_organization_id",
                class_name: "Decidim::Organization"
-    belongs_to :scope,
-               foreign_key: "decidim_scope_id",
-               class_name: "Decidim::Scope",
+    belongs_to :area,
+               foreign_key: "decidim_area_id",
+               class_name: "Decidim::Area",
                optional: true
     has_many :categories,
              foreign_key: "decidim_participatory_space_id",
@@ -39,6 +43,10 @@ module Decidim
       where(promoted: true)
     end
 
+    def self.log_presenter_class_for(_log)
+      Decidim::Assemblies::AdminLog::AssemblyPresenter
+    end
+
     def hashtag
       attributes["hashtag"].to_s.delete("#")
     end

data/app/models/decidim/assembly_user_role.rb

@@ -4,13 +4,21 @@ module Decidim
   # Defines a relation between a user and an assembly, and what kind of relation
   # does the user have.
   class AssemblyUserRole < ApplicationRecord
+    include Traceable
+    include Loggable
+
     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
+    alias participatory_space assembly
 
     ROLES = %w(admin collaborator moderator).freeze
     validates :role, inclusion: { in: ROLES }, uniqueness: { scope: [:user, :assembly] }
     validate :user_and_assembly_same_organization
 
+    def self.log_presenter_class_for(_log)
+      Decidim::Assemblies::AdminLog::AssemblyUserRolePresenter
+    end
+
     private
 
     # Private: check if the process and the user have the same organization

data/app/presenters/decidim/assemblies/admin_log/assembly_presenter.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module AdminLog
+      # This class holds the logic to present a `Decidim::Assembly`
+      # for the `AdminLog` log.
+      #
+      # Usage should be automatic and you shouldn't need to call this class
+      # directly, but here's an example:
+      #
+      #    action_log = Decidim::ActionLog.last
+      #    view_helpers # => this comes from the views
+      #    AssemblyPresenter.new(action_log, view_helpers).present
+      class AssemblyPresenter < Decidim::Log::BasePresenter
+        private
+
+        def diff_fields_mapping
+          {
+            description: :i18n,
+            hashtag: :string,
+            decidim_area_id: :area,
+            decidim_scope_id: :scope,
+            developer_group: :i18n,
+            local_area: :i18n,
+            meta_scope: :i18n,
+            participatory_scope: :i18n,
+            participatory_structure: :i18n,
+            promoted: :boolean,
+            published_at: :date,
+            reference: :string,
+            scopes_enabled: :boolean,
+            short_description: :i18n,
+            show_statistics: :boolean,
+            slug: :default,
+            subtitle: :i18n,
+            target: :i18n,
+            title: :i18n
+          }
+        end
+
+        def i18n_labels_scope
+          "activemodel.attributes.assembly"
+        end
+
+        def action_string
+          case action
+          when "create", "publish", "unpublish", "update"
+            "decidim.admin_log.assembly.#{action}"
+          else
+            super
+          end
+        end
+
+        def has_diff?
+          action == "unpublish" || super
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/assemblies/admin_log/assembly_user_role_presenter.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module AdminLog
+      # This class holds the logic to present a `Decidim::AssemblyUserRole`
+      # for the `AdminLog` log.
+      #
+      # Usage should be automatic and you shouldn't need to call this class
+      # directly, but here's an example:
+      #
+      #    action_log = Decidim::ActionLog.last
+      #    view_helpers # => this comes from the views
+      #    AssemblyUserRolePresenter.new(action_log, view_helpers).present
+      class AssemblyUserRolePresenter < Decidim::Log::BasePresenter
+        private
+
+        def diff_fields_mapping
+          {
+            role: "Decidim::Assemblies::AdminLog::ValueTypes::RolePresenter"
+          }
+        end
+
+        def i18n_labels_scope
+          "activemodel.attributes.assembly_user_role"
+        end
+
+        def action_string
+          case action
+          when "create", "delete", "update"
+            "decidim.admin_log.assembly_user_role.#{action}"
+          else
+            super
+          end
+        end
+
+        def changeset
+          return super unless action.to_s == "delete"
+
+          Decidim::Log::DiffChangesetCalculator.new(
+            { role: [action_log.version.object["role"], ""] },
+            diff_fields_mapping,
+            i18n_labels_scope
+          ).changeset
+        end
+
+        def has_diff?
+          action == "delete" || super
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/assemblies/admin_log/value_types/role_presenter.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module AdminLog
+      module ValueTypes
+        # This class presents the given value as a user role. Check
+        # the `DefaultPresenter` for more info on how value
+        # presenters work.
+        class RolePresenter < Decidim::Log::ValueTypes::DefaultPresenter
+          # Public: Presents the value as a user role.
+          #
+          # Returns an HTML-safe String.
+          def present
+            return if value.blank?
+            h.t(value, scope: "decidim.admin.models.assembly_user_role.roles", default: value)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -75,6 +75,10 @@
       <%= scopes_picker_field form, :scope_id, root: nil %>
     </div>
 
+    <div class="row column">
+      <%= form.select :area_id, option_groups_from_collection_for_select(current_organization.area_types, :areas, :translated_name, :id, :translated_name, current_assembly.try(:decidim_area_id)), include_blank: t(".select_an_area")  %>
+    </div>
+
     <div class="row column">
       <%= form.translated :text_field, :participatory_scope %>
     </div>

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

@@ -65,7 +65,16 @@
               <%= translated_attribute(current_participatory_space.participatory_structure) %>
           </div>
         <% end %>
+
+        <% if translated_attribute(current_participatory_space.try(:area).try(:name)).present? %>
+          <div class="definition-data__item area">
+            <span class="definition-data__title"><%= t("assemblies.show.area", scope: "decidim") %></span>
+              <%= translated_attribute(current_participatory_space.area.area_type.name) %> - <%= translated_attribute(current_participatory_space.area.name) %>
+          </div>
+        <% end %>
+
       </div>
+      <%= resource_reference(current_participatory_space) %>
       <%= render partial: "decidim/shared/share_modal" %>
       <%= embed_modal_for assembly_assembly_widget_url(current_participatory_space, format: :js) %>
     </div>

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

@@ -30,9 +30,21 @@
           <%= 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_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) %>
+      <% if can?(:read, Decidim::AttachmentCollection) || can?(:read, Decidim::Attachment) %>
+        <li>
+          <span class="secondary-nav__subtitle"><%= t("attachments", scope: "decidim.admin.menu.assemblies_submenu") %></span>
+          <ul>
+            <% if can? :read, Decidim::AttachmentCollection %>
+              <li <% if is_active_link?(decidim_admin_assemblies.assembly_attachment_collections_path(current_participatory_space)) %> class="is-active" <% end %>>
+                <%= aria_selected_link_to t("attachment_collections", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.assembly_attachment_collections_path(current_participatory_space) %>
+              </li>
+            <% end %>
+            <% if can? :read, Decidim::Attachment %>
+              <li <% if is_active_link?(decidim_admin_assemblies.assembly_attachments_path(current_participatory_space)) %> class="is-active" <% end %>>
+                <%= aria_selected_link_to t("attachment_files", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.assembly_attachments_path(current_participatory_space) %>
+              </li>
+            <% end %>
+          </ul>
         </li>
       <% end %>
       <% if can? :read, Decidim::AssemblyUserRole %>

data/config/locales/ca.yml

@@ -2,9 +2,12 @@ ca:
   activemodel:
     attributes:
       assembly:
+        area_id: Àrea
         banner_image: Imatge de bàner
         copy_categories: Copiar categories
         copy_features: Copiar funcionalitats
+        decidim_area_id: Àrea
+        decidim_scope_id: Abast
         description: Descripció
         developer_group: Grup promotor
         domain: Àrees municipals
@@ -15,13 +18,15 @@ ca:
         participatory_scope: Àmbit participatiu
         participatory_structure: Estructura participativa
         promoted: Destacat
+        published_at: Publicat el
         scope_id: Àmbit
         scopes_enabled: Àmbit habilitat
         short_description: Descripció breu
+        show_statistics: Mostra estadístiques
         slug: Nom curt d'URL
         subtitle: Subtítol
         target: A qui va dirigit?
-        title: Grup de processos participatius
+        title: Títol
   decidim:
     admin:
       assemblies:
@@ -80,6 +85,8 @@ ca:
         assemblies: Assemblees
         assemblies_submenu:
           assembly_admins: Usuaris de l'assemblea
+          attachment_collections: Col·leccions
+          attachment_files: Fitxers
           attachments: Adjunts
           categories: Categories
           features: Funcionalitats
@@ -91,7 +98,7 @@ ca:
             created_at: Data de creació
             promoted: Destacat
             published: Publicat
-            title: Grup de processos participatius
+            title: Títol
           name: Assemblea
         assembly_user_role:
           fields:
@@ -105,10 +112,21 @@ ca:
             moderator: Moderador
       titles:
         assemblies: Assemblees
+    admin_log:
+      assembly:
+        create: "%{user_name} ha creat l'assemblea %{resource_name}"
+        publish: "%{user_name} ha publicat l'assemblea %{resource_name}"
+        unpublish: "%{user_name} ha despublicat l'assemblea %{resource_name}"
+        update: "%{user_name} ha actualitzat l'assemblea %{resource_name}"
+      assembly_user_role:
+        create: "%{user_name} ha convidat %{resource_name} a l'assemblea %{space_name}"
+        delete: "%{user_name} ha eliminat l'usuari %{resource_name} de l'assemblea %{space_name}"
+        update: "%{user_name} ha canviat el rol de %{resource_name} a l'assemblea %{space_name}"
     assemblies:
       admin:
         assemblies:
           form:
+            select_an_area: Selecciona una àrea
             slug_help: 'Els noms curts d''URL s''utilitzen per generar les URL que apunten a aquesta assemblea. Només accepta lletres, números i guions, i ha de començar amb una lletra. Exemple: %{url}'
         assembly_copies:
           form:
@@ -121,6 +139,7 @@ ca:
             active_assemblies: Assemblees actives
             see_all_assemblies: Veure totes les assemblees
       show:
+        area: Àrea
         developer_group: Grup promotor
         local_area: Àrea municipal
         participatory_scope: Àmbit participatiu
@@ -131,6 +150,7 @@ ca:
         answers_count: Respostes
         assemblies_count: Assemblees
         comments_count: Comentaris
+        endorsements_count: Adhesions
         headline: Activitat
         meetings_count: Trobades presencials
         orders_count: Vots

data/config/locales/en.yml

@@ -3,9 +3,12 @@ en:
   activemodel:
     attributes:
       assembly:
+        area_id: Area
         banner_image: Banner image
         copy_categories: Copy categories
         copy_features: Copy features
+        decidim_area_id: Area
+        decidim_scope_id: Scope
         description: Description
         developer_group: Developer group
         domain: Domain
@@ -16,9 +19,11 @@ en:
         participatory_scope: Participatory scope
         participatory_structure: Participatory structure
         promoted: Promoted
+        published_at: Published at
         scope_id: Scope
         scopes_enabled: Scopes enabled
         short_description: Short description
+        show_statistics: Show statistics
         slug: URL slug
         subtitle: Subtitle
         target: Target
@@ -81,6 +86,8 @@ en:
         assemblies: Assemblies
         assemblies_submenu:
           assembly_admins: Assembly users
+          attachment_collections: Collections
+          attachment_files: Files
           attachments: Attachments
           categories: Categories
           features: Features
@@ -106,10 +113,21 @@ en:
             moderator: Moderator
       titles:
         assemblies: Assemblies
+    admin_log:
+      assembly:
+        create: "%{user_name} created the %{resource_name} assembly"
+        publish: "%{user_name} published the %{resource_name} assembly"
+        unpublish: "%{user_name} unpublished the %{resource_name} assembly"
+        update: "%{user_name} updated the %{resource_name} assembly"
+      assembly_user_role:
+        create: "%{user_name} invited %{resource_name} to the %{space_name} assembly"
+        delete: "%{user_name} removed the user %{resource_name} from the %{space_name} assembly"
+        update: "%{user_name} changed the role of %{resource_name} in the %{space_name} assembly"
     assemblies:
       admin:
         assemblies:
           form:
+            select_an_area: Select an Area
             slug_help: 'URL slugs are used to generate the URLs that point to this assembly. Only accepts letters, numbers and dashes, and must start with a letter. Example: %{url}'
         assembly_copies:
           form:
@@ -122,6 +140,7 @@ en:
             active_assemblies: Active assemblies
             see_all_assemblies: See all assemblies
       show:
+        area: Area
         developer_group: Developer group
         local_area: Local area
         participatory_scope: Participatory scope
@@ -132,6 +151,7 @@ en:
         answers_count: Answers
         assemblies_count: Assemblies
         comments_count: Comments
+        endorsements_count: Endorsements
         headline: Activity
         meetings_count: Meetings
         orders_count: Votes

data/config/locales/es.yml

@@ -2,9 +2,12 @@ es:
   activemodel:
     attributes:
       assembly:
+        area_id: Área
         banner_image: Imagen de banner
         copy_categories: Copiar categorías
         copy_features: Copiar funcionalidades
+        decidim_area_id: Área
+        decidim_scope_id: Ámbito
         description: Descripción
         developer_group: Grupo promotor
         domain: Dominio
@@ -15,9 +18,11 @@ es:
         participatory_scope: Ámbito participativo
         participatory_structure: Estructura participativa
         promoted: Destacado
+        published_at: Publicado
         scope_id: Ámbito
         scopes_enabled: Ámbitos habilitados
         short_description: Descripción breve
+        show_statistics: Mostrar estadísticas
         slug: Texto corto de URL
         subtitle: Subtítulo
         target: '¿A quién va dirigido?'
@@ -80,6 +85,8 @@ es:
         assemblies: Asambleas
         assemblies_submenu:
           assembly_admins: Usuarios de la asamblea
+          attachment_collections: Colecciones
+          attachment_files: Archivos
           attachments: Archivos adjuntos
           categories: Categorías
           features: Funcionalidades
@@ -105,10 +112,21 @@ es:
             moderator: Moderador
       titles:
         assemblies: Asambleas
+    admin_log:
+      assembly:
+        create: "%{user_name} creó la asamblea %{resource_name}"
+        publish: "%{user_name} publicó la asamblea %{resource_name}"
+        unpublish: "%{user_name} despublicó la asamblea %{resource_name}"
+        update: "%{user_name} actualizó la asamblea %{resource_name}"
+      assembly_user_role:
+        create: "%{user_name} invitó %{resource_name} a la asamblea %{space_name}"
+        delete: "%{user_name} eliminó al usuario %{resource_name} de la asamblea %{space_name}"
+        update: "%{user_name} cambió el rol de %{resource_name} en la asamblea %{space_name}"
     assemblies:
       admin:
         assemblies:
           form:
+            select_an_area: Seleccione un Área
             slug_help: 'Los textos cortos de URL se utilizan para generar las URL que apuntan a esta asamblea. Sólo acepta letras, números y guiones, y debe comenzar con una letra. Ejemplo: %{url}'
         assembly_copies:
           form:
@@ -121,6 +139,7 @@ es:
             active_assemblies: Asambleas activas
             see_all_assemblies: Ver todas las asambleas
       show:
+        area: Área
         developer_group: Grupo promotor
         local_area: Áreas municipales
         participatory_scope: Ámbito participativo
@@ -131,6 +150,7 @@ es:
         answers_count: Respuestas
         assemblies_count: Asambleas
         comments_count: Comentarios
+        endorsements_count: Respaldos
         headline: Actividad
         meetings_count: Encuentros
         orders_count: Votos