decidim-decidim_awesome 0.9.1 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ada19fbdb65b2b209a2b65791d392684413373d0ab9c5ed82d01c68c5e632e2
-  data.tar.gz: 1f255d53965277523841e002fe45bdf524f5b055bf8ff94f9df0b1f5aaf7e907
+  metadata.gz: fc4186635bb63b150df6c031e3ef9337fcfb71ce7057eddf5a990564ca1cd065
+  data.tar.gz: c9eaffa1131d1cd81ddb14b45e35928d76901a89e6c5141b3bb03ebb5acac244
 SHA512:
-  metadata.gz: 58a26aa8f0b5da17b1628fcc22ad23a452389ddc53376401220d007a2eb2f2f7a13a3801235d9596c10f64fd3853df69ebe5f7777585daf305faf0ebb1573dd6
-  data.tar.gz: bf9a64bb47fcda049f8ed317aa5c0658977a7b38e1d937054c80e41dff0f2daef3b58920468c0e0f569fc97eacca3075689c694f45f0bec9039485c0dfd89ec0
+  metadata.gz: 4c42aced89189c8f99c5ad6370ba1f490e0ec77ce9df796d007754f2f45bc9e3fbba0583ef2db6a4e1d63127d1d299123a69f1ac6fa23b8a3e5c7a65e20d706b
+  data.tar.gz: 51cefc6f281d1006ac905ac0fcd3e8c5461caa47403d815077d7fe9cb42e5df213f60a9998de4528c1b2caca47e87878f313752452c739a8186b75b8ed3cece5

data/CHANGELOG.md

@@ -1,6 +1,26 @@
 CHANGELOG
 =========
 
+v0.9.3
+------
+
+Compatibility:
+  - Decidim v0.27.3
+  - Decidim v0.26.7
+
+Features:
+  - Fixes for admin accountability leaking other tenants data
+
+v0.9.2
+------
+
+Compatibility:
+  - Decidim v0.27.3
+  - Decidim v0.26.7
+
+Features:
+  - Fixes for the menu hacker
+ 
 v0.9.1
 ------
 

data/README.md

@@ -209,6 +209,7 @@ Depending on your Decidim version, choose the corresponding Awesome version to e
 
 | Awesome version | Compatible Decidim versions |
 |---|---|
+| 0.9.2 | >= 0.26.7, >= 0.27.3 |
 | 0.9.x | 0.26.x, 0.27.x |
 | 0.8.x | 0.25.x, 0.26.x |
 | 0.7.x | 0.23.x, 0.24.x |

data/app/controllers/decidim/decidim_awesome/admin/admin_accountability_controller.rb

@@ -7,7 +7,7 @@ module Decidim
         include NeedsAwesomeConfig
         include Decidim::DecidimAwesome::AdminAccountability::Admin::Filterable
 
-        helper_method :admin_actions, :collection, :export_params, :global?
+        helper_method :admin_actions, :collection, :export_params, :global?, :global_users_missing_date
 
         layout "decidim/admin/users"
 
@@ -35,7 +35,15 @@ module Decidim
         end
 
         def collection
-          @collection ||= paginate(global? ? PaperTrailVersion.admin_role_actions(params[:admin_role_type]) : PaperTrailVersion.space_role_actions)
+          @collection = global? ? paginate(admin_role_actions) : paginate(space_role_actions)
+        end
+
+        def space_role_actions
+          @space_role_actions ||= Decidim::DecidimAwesome::PaperTrailVersion.space_role_actions(current_organization)
+        end
+
+        def admin_role_actions
+          @admin_role_actions ||= Decidim::DecidimAwesome::PaperTrailVersion.in_organization(current_organization).admin_role_actions(params[:admin_role_type])
         end
 
         def export_params
@@ -45,6 +53,19 @@ module Decidim
         def global?
           params[:admins] == "true"
         end
+
+        # User traceability was introduced in version 0.24. Users created before that might appear in the list.
+        # Returns the first traceability record available if there are users created before.
+        # Returns nil otherwise
+        def global_users_missing_date
+          return unless global?
+
+          @global_users_missing_date ||= begin
+            first_version = Decidim::DecidimAwesome::PaperTrailVersion.where(item_type: "Decidim::UserBaseEntity").last
+            first_user = Decidim::User.first
+            first_version.created_at if first_user && first_version && (first_version.created_at > first_user.created_at + 1.second)
+          end
+        end
       end
     end
   end

data/app/models/decidim/decidim_awesome/paper_trail_version.rb

@@ -3,13 +3,27 @@
 module Decidim
   module DecidimAwesome
     class PaperTrailVersion < PaperTrail::Version
-      default_scope { order("created_at DESC") }
+      default_scope { order("versions.created_at DESC") }
 
       def self.safe_user_roles
         DecidimAwesome.participatory_space_roles.filter(&:safe_constantize)
       end
 
-      scope :space_role_actions, -> { where(item_type: PaperTrailVersion.safe_user_roles, event: "create") }
+      scope :space_role_actions, lambda { |organization|
+        role_changes = where(item_type: PaperTrailVersion.safe_user_roles, event: "create")
+        user_ids_from_object_changes = role_changes.pluck(:object_changes).map { |change| change.match(/decidim_user_id:\n- ?\n- (\d+)/)[1].to_i }
+        relevant_user_ids = Decidim::User.select(:id).where(id: user_ids_from_object_changes, organization: organization).pluck(:id)
+        # add users that might have been completly destroyed in any organization
+        relevant_user_ids += user_ids_from_object_changes - Decidim::User.select("id").where(id: user_ids_from_object_changes).pluck(:id)
+
+        role_changes.where("object_changes ~ ANY (array[?])", relevant_user_ids.map { |id| "decidim_user_id:\n- ?\n- #{id}" })
+      }
+
+      scope :in_organization, lambda { |organization|
+        joins("LEFT JOIN decidim_users ON decidim_users.id = item_id")
+          .where("item_type = 'Decidim::UserBaseEntity' AND decidim_users.decidim_organization_id = ?", organization.id)
+          .order("versions.created_at DESC")
+      }
 
       def self.admin_role_actions(filter = nil)
         base = where(item_type: "Decidim::UserBaseEntity", event: %w(create update))
@@ -92,7 +106,7 @@ module Decidim
       end
 
       ransacker :created_at, type: :date do
-        Arel.sql("date(created_at)")
+        Arel.sql("date(versions.created_at)")
       end
     end
   end

data/app/packs/src/decidim/decidim_awesome/awesome_map/controllers/controller.js

@@ -22,15 +22,32 @@ export default class Controller {
   }
 
   setFetcher(Fetcher) {
+    let checkProposalState = function (node, map) {
+      const showConfig = map.config.show;
+      const { withdrawn, accepted, evaluating, notAnswered, rejected } = showConfig;
+
+      return withdrawn && node.state === "withdrawn" ||
+        accepted && node.state === "accepted" ||
+        evaluating && node.state === "evaluating" ||
+        notAnswered && node.state === "notAnswered" ||
+        rejected && node.state === "rejected";
+    }
+
     this.fetcher = new Fetcher(this);
     this.fetcher.onFinished = () => {
       // console.log(`all ${this.component.type} loaded`, this)
       this._onFinished();
     };
     this.fetcher.onCollection = (collection) =>  {
-      if (collection && collection.edges)  { 
+      if (collection && collection.edges)  {
         // Add markers to the main cluster group
-        const collectionEdges = collection.edges.filter((item) => item.node.coordinates && item.node.coordinates.latitude && item.node.coordinates.longitude);
+        let collectionEdges = [];
+        if (this.fetcher.collection === "meetings") {
+          collectionEdges = collection.edges.filter((item) => item.node.coordinates && item.node.coordinates.latitude && item.node.coordinates.longitude);
+        } else {
+          collectionEdges = collection.edges.filter((item) => item.node.coordinates && item.node.coordinates.latitude && item.node.coordinates.longitude && checkProposalState(item.node, this.awesomeMap));
+        }
+
         try {
           this.awesomeMap.cluster.addLayers(collectionEdges.map((item) => item.node.marker));
         } catch (evt) {
@@ -58,7 +75,7 @@ export default class Controller {
 
   addMarker(marker, node) {
 
-    /* 
+    /*
     theorically, this should be enough to create popups on markers but it looks that
     there is some bug in leaflet that sometimes prevents this to work
     */
@@ -101,7 +118,7 @@ export default class Controller {
       } catch (evt) {
         console.error("Failed category marker assignation", marker, evt.message);
       }
-    }   
+    }
   }
 
   addMarkerHashtags(marker, hashtags) {

data/app/views/decidim/decidim_awesome/admin/admin_accountability/index.html.erb

@@ -22,6 +22,11 @@
 
   <div class="card-section">
     <p class="help-text"><%= t(global? ? ".global_description" : ".description") %></p>
+
+    <% if global_users_missing_date %>
+      <div class="callout warning"><%= t(".missing_users", date: l(global_users_missing_date, format: :decidim_short)) %></div>
+    <% end %>
+
     <div class="table-scroll">
       <table class="table-list">
         <thead>

data/config/locales/ca.yml

@@ -50,7 +50,23 @@ ca:
         proposal_custom_fields: Camps personalitzats
   decidim:
     admin:
+      filters:
+        admin_accountability:
+          admin_role_type:
+            label: Tipus de rol
+          participatory_space_type_eq:
+            label: Tipus d'espai participatiu
+          role:
+            label: Rol
+          role_type_eq:
+            label: Tipus de rol
+        label:
+          search_field_end_date: 'Fins al dia:'
+          search_field_start_date: 'Des del dia:'
+        search_placeholder:
+          user_name_or_user_email_cont: Cerca per nom de participant, email
       menu:
+        admin_accountability: Històric d'administradores
         decidim_awesome: Decidim Awesome
     components:
       awesome_iframe:
@@ -91,6 +107,41 @@ ca:
             show_withdrawn: Mostra les propostes retirades
     decidim_awesome:
       admin:
+        admin_accountability:
+          admin_roles:
+            admin: Administradora de plataforma
+            user_manager: Administradora de participants
+          created_at: Rol creat el
+          currently_active: Actiu
+          deleted_user: Rol eliminat
+          email: Email
+          exports:
+            button: Exporta aquesta cerca
+            export_as: Exporta com %{export_format}
+            export_format:
+              csv: CSV
+              json: JSON
+              xlsx: XLSX
+            notice: L'exportació s'està enviant. Rebràs un correu electrònic quan estigui llest.
+          index:
+            description: Aquí trobareu totes les participants que han tingut algun paper en l'administració d'un espai participatiu. Les administradores de plataforma no apareixen a la llista.
+            global_description: Aquí trobareu totes les participants que han tingut algun paper en l'administració de la plataforma. Les administradores d'un espai participatiu no apareixen a la llista.
+            see_global: Llista global d'administradores de plataforma
+            see_spaces: Llista global d'administradores d'un espai participatiu
+            title: Històric d'administradores
+          last_login: Darrera data d'identificació
+          missing_info: "(falta informació)"
+          missing_user: La participant no existeix a la base de dades
+          name: Nom
+          never_logged: No loguejat encara
+          participatory_space: Espai participatiu
+          removal_date: Rol eliminat el
+          role: Rol
+          roles:
+            admin: Administradora
+            collaborator: Col·laboradora
+            moderator: Moderadora
+            valuator: Avaluadora
         checks:
           index:
             admin_head_tags: Etiquetes Awesome incloses a la capçalera de l'aplicació d'administració
@@ -320,7 +371,7 @@ ca:
           text_settings: Configuració del text
           title: Títol
           truncate: Nombre màxim de caràcters per les descripcions emergents
-      credits: Decidim Awesome %{version} · Maintained with ♥ by %{company}
+      credits: Decidim Awesome %{version} · Mantingut amb ♥ per %{company}
       custom_fields:
         errors:
           invalid_fields: No s'ha pogut analitzar el contingut però s'ha assignat al camp '%{field}'

data/config/locales/cs.yml

@@ -24,7 +24,11 @@ cs:
         validate_body_max_caps_percent: Maximální povolený procentní podíl velkých písmen pro tělo zprávy
         validate_body_max_marks_together: Maximální počet po sobě jdoucích značek povolených v těle zprávy
         validate_body_min_length: Minimální požadované znaky pro tělo zprávy
+        validate_body_start_with_caps: Vynutit začít tělo textu velkým písmenem
         validate_title_max_caps_percent: Maximální povolený procentní podíl velkých písmen pro nadpis zprávy
+        validate_title_max_marks_together: Maximální počet po sobě jdoucích značek povolených v těle zprávy
+        validate_title_min_length: Minimální počet znaků pro tělo zprávy
+        validate_title_start_with_caps: Vynutit začít tělo textu velkým písmenem
       constraint:
         component_id: nebo konkrétně v
         component_manifest: Pouze v komponentách typu
@@ -46,7 +50,23 @@ cs:
         proposal_custom_fields: Vlastní pole
   decidim:
     admin:
+      filters:
+        admin_accountability:
+          admin_role_type:
+            label: Typ role
+          participatory_space_type_eq:
+            label: Typ participačního prostoru
+          role:
+            label: Role
+          role_type_eq:
+            label: Typ role
+        label:
+          search_field_end_date: 'Do dne:'
+          search_field_start_date: 'Od dne:'
+        search_placeholder:
+          user_name_or_user_email_cont: Hledat podle uživatelského jména, emailu
       menu:
+        admin_accountability: Odpovědnost správce
         decidim_awesome: Úžasné Decidim
     components:
       awesome_iframe:
@@ -87,6 +107,41 @@ cs:
             show_withdrawn: Zobrazit stažené návrhy
     decidim_awesome:
       admin:
+        admin_accountability:
+          admin_roles:
+            admin: Super správce
+            user_manager: Správce uživatelů
+          created_at: Role vytvořena v
+          currently_active: Nyní aktivní
+          deleted_user: Smazat uživatele
+          email: E-mail
+          exports:
+            button: Exportovat toto hledání
+            export_as: Export jako %{export_format}
+            export_format:
+              csv: CSV
+              json: JSON
+              xlsx: XLSX
+            notice: Export úlohy byl zařazen do fronty. Až bude připraven, obdržíte e-mail.
+          index:
+            description: Zde najdete všechny uživatele, kteří měli nějakou roli ve správě participačního prostoru. Běžní správci nejsou uvedeni.
+            global_description: Zde najdete všechny uživatele, kteří měli nějakou globální roli ve správě participačního prostoru. Běžní správci nejsou uvedeni.
+            see_global: Seznam globálních správců
+            see_spaces: Seznam administrátorů participačního prostoru
+            title: Odpovědnost správce
+          last_login: Datum posledního přihlášení
+          missing_info: "(chybějící informace)"
+          missing_user: Uživatel není v databázi
+          name: Jméno
+          never_logged: Nikdy nepřihlášen
+          participatory_space: Participační prostor
+          removal_date: Role odebrána v
+          role: Role
+          roles:
+            admin: Administrátor
+            collaborator: Spolupracovník
+            moderator: Moderátor
+            valuator: Hodnotitel
         checks:
           index:
             admin_head_tags: Úžasné tagy zahrnuté v hlavičce administrace aplikace
@@ -155,6 +210,10 @@ cs:
               scoped_styles: Vytvořte vlastní CSS aplikovaný pouze na určitých částech veřejného webu (použijte pro to editor omezení)
               scoped_styles_variables: 'Můžete použít následující CSS proměnné pro nastavené barvy organizace:'
               use_markdown_editor: Toto nahradí WYSIWYG editor, místo toho použijte Markdown editor. Text bude vykreslen jako HTML na veřejných stránkách (text v databázi bude uložen jako text markdown)
+              validate_body_max_caps_percent: Nula nedovolí žádné velké písmeno, 100 bude nutit psát vše velkými písmeny
+              validate_body_max_marks_together: 'Omezit počet otazníků a vykřičníků, které lze psát dohromada. Např: Pokud je 2, pak ''!!!'' nebude v textu povoleno'
+              validate_body_min_length: Toto číslo může být nulové, toto pole bude ve skutečnosti nepovinné
+              validate_title_max_caps_percent: Nula nedovolí žádné velké písmeno, 100 bude nutit psát vše velkými písmeny
           form_proposal_custom_fields:
             new: Přidat nové pole "vlastní pole"
             remove: Odstranit toto "vlastní pole"

data/config/locales/de.yml

@@ -50,7 +50,23 @@ de:
         proposal_custom_fields: Eingabefelder
   decidim:
     admin:
+      filters:
+        admin_accountability:
+          admin_role_type:
+            label: Rollen-Typ
+          participatory_space_type_eq:
+            label: Partizipativer Raumtyp
+          role:
+            label: Rolle
+          role_type_eq:
+            label: Rollen-Typ
+        label:
+          search_field_end_date: 'Bis heute:'
+          search_field_start_date: 'Ab Datum:'
+        search_placeholder:
+          user_name_or_user_email_cont: Suche nach Benutzernamen oder E-Mail
       menu:
+        admin_accountability: Admin Verantwortlichkeit
         decidim_awesome: Decidim Awesome
     components:
       awesome_iframe:
@@ -91,6 +107,41 @@ de:
             show_withdrawn: Zurückgezogene Vorschläge anzeigen
     decidim_awesome:
       admin:
+        admin_accountability:
+          admin_roles:
+            admin: Superadministrator
+            user_manager: Benutzer Manager
+          created_at: Rolle erstellt am
+          currently_active: Derzeit aktiv
+          deleted_user: Gelöschter Benutzer
+          email: E-Mail
+          exports:
+            button: Diese Suche exportieren
+            export_as: Exportieren als %{export_format}
+            export_format:
+              csv: CSV
+              json: JSON
+              xlsx: XLSX
+            notice: Der Exportauftrag wurde in die Warteschlange gestellt. Sie erhalten eine E-Mail, wenn er fertig ist.
+          index:
+            description: Hier finden Sie alle Benutzer, die eine administrator-Rolle in der Verwaltung eines partizipatorischen Raumes gespielt haben. Superadministratoren sind nicht aufgeführt.
+            global_description: Hier finden Sie alle Benutzer, die eine superadministratoren-Rolle in der Verwaltung eines partizipatorischen Raumes gespielt haben. Normalen administrator-Rolle sind nicht aufgeführt.
+            see_global: Globale Admins auflisten
+            see_spaces: Admins von partizipativen Räumen auflisten
+            title: Admin-Verantwortung
+          last_login: Letztes Anmeldedatum
+          missing_info: "(fehlende Informationen)"
+          missing_user: Benutzer nicht in der Datenbank
+          name: Name
+          never_logged: Nie angemeldet
+          participatory_space: Partizipativer Raum
+          removal_date: Rolle entfernt am
+          role: Rolle
+          roles:
+            admin: Admin
+            collaborator: Mitarbeiter
+            moderator: Moderator
+            valuator: Schätzer
         checks:
           index:
             admin_head_tags: Angezeigte Awesome Tags im Admin Application Header
@@ -316,6 +367,7 @@ de:
           text_settings: Text-Einstellungen
           title: Titel
           truncate: Maximale Zeichenanzahl für Popup-Beschreibungen
+      credits: Decidim awesome %{version} · Gepflegt mit ❤️ durch %{company}
       custom_fields:
         errors:
           invalid_fields: Der Inhalt konnte nicht geparst werden, wurde aber dem Feld '%{field}' zugewiesen.

data/config/locales/en.yml

@@ -144,6 +144,9 @@ en:
             global_description: Listed here you'll find all users that have had some
               global role in administrating this organization. Participatory space
               admins are not listed.
+            missing_users: 'NOTE: This list might not include users created/removed
+              before %{date}. This is because "user traceability" was introduced in
+              Decidim v0.24 and this installation is probably older.'
             see_global: List global admins
             see_spaces: List participatory space admins
             title: Admin accountability

data/config/locales/es.yml

@@ -21,6 +21,14 @@ es:
         scoped_admins: 'Grupo de administradoras acotadas #%{id}'
         scoped_styles: 'Estilos personalizados #%{id}'
         use_markdown_editor: Utilizar el editor Markdown en lugar del editor HTML
+        validate_body_max_caps_percent: Porcentaje máximo permitido de letras mayúsculas para el cuerpo
+        validate_body_max_marks_together: Máximo número de símbolos consecutivos permitidos en el cuerpo
+        validate_body_min_length: Mínimo de caracteres requeridos para el cuerpo
+        validate_body_start_with_caps: Forzar al cuerpo a comenzar con una letra mayúscula
+        validate_title_max_caps_percent: Porcentaje máximo permitido de letras mayúsculas para el título
+        validate_title_max_marks_together: Máximo número de símbolos consecutivos permitidos en el título
+        validate_title_min_length: Mínimo de caracteres requeridos para el título
+        validate_title_start_with_caps: Forzar al título a comenzar con una letra mayúscula
       constraint:
         component_id: o específicamente en
         component_manifest: Solo en componentes de tipo
@@ -42,7 +50,23 @@ es:
         proposal_custom_fields: Campos personalizados
   decidim:
     admin:
+      filters:
+        admin_accountability:
+          admin_role_type:
+            label: Tipo de rol
+          participatory_space_type_eq:
+            label: Tipo de espacio participativo
+          role:
+            label: Rol
+          role_type_eq:
+            label: Tipo de rol
+        label:
+          search_field_end_date: 'Hasta la fecha:'
+          search_field_start_date: 'Desde la fecha:'
+        search_placeholder:
+          user_name_or_user_email_cont: Buscar por nombre de participante, email
       menu:
+        admin_accountability: Histórico de administradoras
         decidim_awesome: Decidim Awesome
     components:
       awesome_iframe:
@@ -83,6 +107,41 @@ es:
             show_withdrawn: Muestra las propuestas retiradas
     decidim_awesome:
       admin:
+        admin_accountability:
+          admin_roles:
+            admin: Administradora de plataforma
+            user_manager: Administradora de participantes
+          created_at: Rol creado en
+          currently_active: Activo
+          deleted_user: Participante eliminada
+          email: Correo electrónico
+          exports:
+            button: Exportar esta búsqueda
+            export_as: Exporta como %{export_format}
+            export_format:
+              csv: CSV
+              json: JSON
+              xlsx: XLSX
+            notice: La exportación se está preparando. Recibirá un correo electrónico cuando esté listo.
+          index:
+            description: Listado aquí encontrarás todas las participantes que han tenido algún papel en la administración de un espacio participativo. Las administradoras de plataforma no aparecen en la lista.
+            global_description: Listado aquí encontrarás todos los usuarios que han tenido un papel en la administración de la plataforma. Las administradoras de espacio participativo no están listadas.
+            see_global: Lista de administradoras de plataforma
+            see_spaces: Lista de administradoras de espacio participativo
+            title: Histórico de administradoras
+          last_login: Última fecha de conexión
+          missing_info: "(falta información)"
+          missing_user: Participante no está en la base de datos
+          name: Nombre
+          never_logged: Nunca ha iniciado sesión aún
+          participatory_space: Espacio participativo
+          removal_date: Rol eliminado en
+          role: Rol
+          roles:
+            admin: Administradora
+            collaborator: Colaborador/a
+            moderator: Moderadora
+            valuator: Evaluador/a
         checks:
           index:
             admin_head_tags: Etiquetas Awesome incluidas en el encabezado de la aplicación de administración
@@ -151,6 +210,15 @@ es:
               scoped_styles: Crea CSS personalizados que solo se apliquen en ciertas partes de la web pública (para ello, utiliza el editor de restricciones)
               scoped_styles_variables: 'Puedes utilizar las siguientes variables CSS para los colores personalizados de la organización:'
               use_markdown_editor: Esto sustituirá al editor HTML (Quill), utilice un editor de Markdown en su lugar. El texto se mostrará como HTML en las páginas públicas (en la base de datos, el texto se almacenará como markdown)
+              validate_body_max_caps_percent: Cero no permitirá ninguna letra mayúscula, 100 forzará a escribir todo en mayúsculas
+              validate_body_max_marks_together: 'Limitar el número de símbolos de preguntas y exclamaciones que se pueden escribir juntos. Es decir, si es 2, entonces ''!!!'' no estará permitido en el texto'
+              validate_body_min_length: Este número puede ser cero, lo que permite que este campo no sea obligatorio
+              validate_title_max_caps_percent: Cero no permitirá ninguna letra mayúscula, 100 forzará a escribir todo en mayúsculas
+              validate_title_max_marks_together: 'Limitar el número de símbolos de preguntas y exclamaciones que se pueden escribir juntos. Es decir, si es 2, entonces ''!!!'' no estará permitido en el texto'
+              validate_title_min_length: El título siempre es obligatorio y este número no puede ser cero
+            validators:
+              body: Validaciones de entrada de usuario para el campo "cuerpo"
+              title: Validaciones de entrada de usuario para el campo "título"
           form_proposal_custom_fields:
             new: Añadir una nueva caja de "campos personalizados"
             remove: Eliminar esta caja de "campos personalizados"
@@ -260,6 +328,7 @@ es:
               hidden: Siempre oculto
               logged: Solo visible para usuarias logeadas
               non_logged: Solo visible para usuarias no logeadas
+              verified_user: Sólo visible para usuarios con una autorización válida
           index:
             confirm_destroy: '¿Estás segura que quieres eliminar este elemento?'
             edit: Editar
@@ -302,7 +371,6 @@ es:
           text_settings: Ajustes del texto
           title: Título
           truncate: Número máximo de caracteres para las descripciones emergentes
-      credits: Decidim Awesome %{version} · Maintained with ♥ by %{company}
       custom_fields:
         errors:
           invalid_fields: No se ha podido analizar el contenido pero se ha asignado al campo '%{field}'
@@ -328,6 +396,8 @@ es:
           show:
             view_meeting: Ver encuentro
             view_proposal: Ver propuesta
+      validators:
+        too_much_caps: Contiene demasiadas letras mayúsculas (más del %{percent}% del texto)
   layouts:
     decidim:
       admin:

data/config/locales/fr.yml

@@ -50,7 +50,23 @@ fr:
         proposal_custom_fields: Champs personnalisés
   decidim:
     admin:
+      filters:
+        admin_accountability:
+          admin_role_type:
+            label: Type de rôle
+          participatory_space_type_eq:
+            label: Type d'espace participatif
+          role:
+            label: Rôle
+          role_type_eq:
+            label: Type de rôle
+        label:
+          search_field_end_date: 'Jusqu''à:'
+          search_field_start_date: 'De:'
+        search_placeholder:
+          user_name_or_user_email_cont: Recherche par nom d'utilisateur ou email
       menu:
+        admin_accountability: Suivi administrateur
         decidim_awesome: Decidim awesome
     components:
       awesome_iframe:
@@ -91,6 +107,41 @@ fr:
             show_withdrawn: Afficher les propositions retirées
     decidim_awesome:
       admin:
+        admin_accountability:
+          admin_roles:
+            admin: Super administrateur
+            user_manager: Gestionnaire d'utilisateurs
+          created_at: Rôle créé le
+          currently_active: Actuellement actif
+          deleted_user: Utilisateur supprimé
+          email: Email
+          exports:
+            button: Exporter cette recherche
+            export_as: Exporter en tant que %{export_format}
+            export_format:
+              csv: CSV
+              json: JSON
+              xlsx: XLSX
+            notice: La tâche d'exportation a été mise en file d'attente. Vous recevrez un email quand elle sera réalisée.
+          index:
+            description: Vous trouverez ici la liste de tous les utilisateurs ayant un rôle dans l'administration d'un espace participatif. Les administrateurs "normaux" ne sont pas listés.
+            global_description: Vous trouverez ici la liste de tous les utilisateurs ayant un rôle global dans l'administration de cette organisation. Les administrateurs d'espaces participatifs ne sont pas listés.
+            see_global: Lister les administrateurs globaux
+            see_spaces: Lister les administrateurs d'espace participatif
+            title: Suivi administrateur
+          last_login: Date de la dernière connexion
+          missing_info: "(informations manquantes)"
+          missing_user: Utilisateur introuvable dans la base de données
+          name: Nom
+          never_logged: Ne s'est jamais connecté
+          participatory_space: Espace participatif
+          removal_date: Rôle retiré le
+          role: Rôle
+          roles:
+            admin: Administrateur
+            collaborator: Collaborateur
+            moderator: Modérateur
+            valuator: Evaluateur
         checks:
           index:
             admin_head_tags: '"Awesome tags" (balises) inclus dans l''en-tête de l''application d''administration'
@@ -320,7 +371,7 @@ fr:
           text_settings: Paramètres de texte
           title: Titre
           truncate: Caractères maximum pour les descriptions des popups
-      credits: Décidim Awesome %{version} · Maintained with ♥ by %{company}
+      credits: Décidim Awesome %{version} · Fait avec ♥ par %{company}
       custom_fields:
         errors:
           invalid_fields: Le contenu n'a pas pu être analysé mais a été assigné au champ '%{field}'

data/config/locales/it.yml

@@ -302,7 +302,6 @@ it:
           text_settings: Impostazioni Testo
           title: Titolo
           truncate: Numero massimo di caratteri per le descrizioni nei popup
-      credits: Decidim Awesome %{version} · Maintained with ♥ by %{company}
       custom_fields:
         errors:
           invalid_fields: Il contenuto non può essere analizzato ma è stato assegnato al campo '%{field}'

data/config/locales/ja.yml

@@ -21,10 +21,18 @@ ja:
         scoped_admins: 'スコープ付き管理者グループ #%{id}'
         scoped_styles: 'カスタムスタイル #%{id}'
         use_markdown_editor: HTMLエディターの代わりにMarkdownエディターを使用する
+        validate_body_max_caps_percent: 本文内での大文字の最大許容割合
+        validate_body_max_marks_together: 本文で許容される最多連続記号文字数
+        validate_body_min_length: 本文に必要な最小文字数
+        validate_body_start_with_caps: 本文を大文字で始めることを強制する
+        validate_title_max_caps_percent: タイトル内での大文字の最大許容割合
+        validate_title_max_marks_together: タイトルで許容される最多連続記号文字数
+        validate_title_min_length: タイトルに必要な最小文字数
+        validate_title_start_with_caps: タイトルを大文字で始めることを強制する
       constraint:
         component_id: 以下のみに適用
         component_manifest: このタイプのコンポーネントのみ有効
-        participatory_space_manifest: 以下のタイプの参加スペースに適用
+        participatory_space_manifest: 以下のタイプの参加型スペースに適用
         participatory_space_slug: あるいは、以下の参加スペースに適用
       custom_redirect:
         active: 有効
@@ -42,7 +50,23 @@ ja:
         proposal_custom_fields: カスタム項目
   decidim:
     admin:
+      filters:
+        admin_accountability:
+          admin_role_type:
+            label: ロールの種別
+          participatory_space_type_eq:
+            label: 参加型スペース種別
+          role:
+            label: ロール
+          role_type_eq:
+            label: ロールの種別
+        label:
+          search_field_end_date: '終了日:'
+          search_field_start_date: '開始日:'
+        search_placeholder:
+          user_name_or_user_email_cont: ユーザー名、メールアドレスで検索する
       menu:
+        admin_accountability: 管理者のアカウンタビリティ
         decidim_awesome: Decidim awesome
     components:
       awesome_iframe:
@@ -83,6 +107,41 @@ ja:
             show_withdrawn: 撤回された提案を表示
     decidim_awesome:
       admin:
+        admin_accountability:
+          admin_roles:
+            admin: スーパー管理者
+            user_manager: ユーザーマネージャー
+          created_at: ロールの作成日時
+          currently_active: 現在アクティブ
+          deleted_user: 削除されたユーザー
+          email: メールアドレス
+          exports:
+            button: この検索結果をエクスポート
+            export_as: '%{export_format} としてエクスポート'
+            export_format:
+              csv: CSV
+              json: JSON
+              xlsx: XLSX
+            notice: エクスポート処理がキューに追加されました。準備ができたらメールが届きます。
+          index:
+            description: ここには、参加型スペースの管理に何らかの役割を持っていたすべてのユーザーが表示されます。一般の管理者は表示されません。
+            global_description: ここには、この組織を管理するためにグローバルな役割を持っているすべてのユーザーが表示されます。参加型スペースの管理者は表示されません。
+            see_global: グローバル管理者一覧
+            see_spaces: 参加型スペース管理者一覧
+            title: 管理者のアカウンタビリティ
+          last_login: 最終ログイン日
+          missing_info: "(不足情報)"
+          missing_user: データベースにいないユーザー
+          name: 名前
+          never_logged: 未ログイン
+          participatory_space: 参加型スペース
+          removal_date: ロールの削除日時
+          role: ロール
+          roles:
+            admin: 管理者
+            collaborator: コラボレーター
+            moderator: モデレーター
+            valuator: 評価者
         checks:
           index:
             admin_head_tags: 管理者向けアプリケーションヘッダーに含まれる Awesome tags
@@ -151,6 +210,15 @@ ja:
               scoped_styles: 公開ウェブの特定の部分にのみ適用されるカスタムCSSを作成します (制限されたエディタを使用してください)
               scoped_styles_variables: '組織の色のカスタマイズには、以下のCSS変数が使用できます。'
               use_markdown_editor: これはQuill WYSIWYGエディターを置き換えて、代わりにMarkdownエディターを使えるようにします。テキストはDB内ではHTML形式に変換・保存されます。
+              validate_body_max_caps_percent: ゼロの場合大文字を許可しません。100の場合すべてを大文字で書くことを強制します。
+              validate_body_max_marks_together: '並べて入力できる「?」と「!」の数を制限します。 すなわち、それが2の場合、「!!!」はテキストに記入できません'
+              validate_body_min_length: この数字はゼロにできます。その場合、このフィールドを必須ではなくする効果があります。
+              validate_title_max_caps_percent: ゼロの場合大文字を許可しません。100の場合すべてを大文字で書くことを強制します。
+              validate_title_max_marks_together: '並べて入力できる「?」と「!」の数を制限します。 すなわち、それが2の場合、「!!!」はテキストに記入できません'
+              validate_title_min_length: タイトルは常に必須です。この数字はゼロにはできません
+            validators:
+              body: '「body」フィールドのユーザー入力検証'
+              title: '「タイトル」フィールドのユーザー入力検証'
           form_proposal_custom_fields:
             new: 新しい「カスタム項目」ボックスを追加
             remove: '「カスタム項目」ボックスを削除'
@@ -169,7 +237,7 @@ ja:
           show:
             title: '%{setting} の詳細設定'
             update: 設定を更新する
-          system: 参加スペース以外のすべて
+          system: 参加型スペース以外のすべて
           update:
             error: 設定更新エラー %{error}
             success: 設定は正常に更新されました
@@ -328,6 +396,8 @@ ja:
           show:
             view_meeting: ミーティングを表示
             view_proposal: 提案を表示
+      validators:
+        too_much_caps: 大文字が多すぎます（テキストの %{percent}%以上）
   layouts:
     decidim:
       admin:

data/config/locales/nl.yml

@@ -211,7 +211,6 @@ nl:
           show_rejected: Toon afgewezen voorstellen
           show_withdrawn: Toon ingetrokken voorstellen
           truncate: Maximaal aantal tekens voor popup beschrijvingen
-      credits: Decidim Awesome %{version} · Maintained with ♥ by %{company}
       editor_images:
         create:
           error: Fout bij uploaden afbeelding!

data/config/locales/pt-BR.yml

@@ -302,7 +302,6 @@ pt-BR:
           text_settings: Configurações de texto
           title: Título
           truncate: Máximo de caracteres para descrições em popup
-      credits: Decidim Incrível %{version} · Maintained with ♥ by %{company}
       custom_fields:
         errors:
           invalid_fields: O conteúdo não pode ser analisado, mas foi atribuído ao campo '%{field}'

data/lib/decidim/decidim_awesome/checksums.yml

@@ -12,6 +12,7 @@ decidim-core:
     decidim-0.25: 742698903a30034094c01aecaca6de84
     decidim-0.26: 651830d87aeeeff39316a787fc70d461
     decidim-0.26.4: eac4ea47c09762aa2e56300bf7e98f31
+    decidim-0.27.3: a9585960d5979aa3adbf5561010513fe
   /app/presenters/decidim/menu_presenter.rb:
     decidim-0.25: f3b05daf279f909f8b3b628658dd5810
   /app/presenters/decidim/menu_item_presenter.rb:
@@ -28,13 +29,18 @@ decidim-proposals:
   /app/helpers/decidim/proposals/application_helper.rb:
     decidim-0.26: 216c974bc425393c18b01bfc4eed4f0b
     decidim-0.26.4: 2e673d2aabe66a80a971d7ff80ebdbb8
+    decidim-0.26.7: ddd9a1f88609c8c7b60c07882d026441
     decidim-0.27: c0ebeac39ebe4926bf0e5fc585a384d7
     decidim-0.27.1: a4f902d1c4829a7f7f62299686f8604e
-  /app/views/decidim/proposals/collaborative_drafts/show.html.erb:
-    decidim-0.24: 2a7e0a4c65361f238fd1b917f39c8642
+    decidim-0.27.3: a9c9ed5eedaf7bf80afaf9ff5a89c254
   /app/views/decidim/proposals/collaborative_drafts/_edit_form_fields.html.erb:
-    decidim-0.26: 97fa28043a26fc2940d30d38d9a7369b
-    decidim-0.27: f356c7611279e76f16d12bb164e11e83
+    # this file is not overriden anymore but it needs to be the last version
+    decidim-0.26: 519a0d34a9ffbd8b9c26d9b68ff4e2a3
+    decidim-0.27.3: 949b2163c547742549531320bf5e0de1
+  /app/views/decidim/proposals/collaborative_drafts/show.html.erb:
+    # this file is not overriden anymore but it needs to be the last version
+    decidim-0.26: 519a0d34a9ffbd8b9c26d9b68ff4e2a3
+    decidim-0.27.3: b1ec22d35263a2ac96fe4604c0ceb752
   /app/views/decidim/proposals/admin/proposals/_form.html.erb:
     decidim-0.25: 90a04984d4269398b7cd21aa33763a1f
     decidim-0.27: f60168e432e1d419e5aec5d3d1e53f0e

data/lib/decidim/decidim_awesome/menu_hacker.rb

@@ -36,7 +36,7 @@ module Decidim
       attr_reader :name, :view
 
       def default_items
-        @default_items ||= build_menu.instance_variable_get(:@items).map do |item|
+        @default_items ||= build_menu.items.map do |item|
           item.instance_variable_set(:@active, method(:activate?)) unless item.active == :exact
           item
         end

data/lib/decidim/decidim_awesome/version.rb

@@ -3,7 +3,7 @@
 module Decidim
   # This holds the decidim-decidim_awesome version.
   module DecidimAwesome
-    VERSION = "0.9.1"
+    VERSION = "0.9.3"
     COMPAT_DECIDIM_VERSION = [">= 0.26.0", "< 0.28"].freeze
   end
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "decidim-module-decidim_awesome",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "description": "Mods and tweaks for Decidim",
   "main": "index.js",
   "directories": {
@@ -29,7 +29,7 @@
   "homepage": "https://github.com/decidim-ice/decidim-module-decidim_awesome#readme",
   "stylelint": {
     "extends": "@decidim/stylelint-config",
-    "rules" : {
+    "rules": {
       "block-opening-brace-space-before": "always"
     }
   },
@@ -37,7 +37,7 @@
     "@babel/eslint-parser": "^7.19.1",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/plugin-proposal-private-methods": "^7.18.6",
-    "@babel/plugin-proposal-private-property-in-object": "^7.20.5",
+    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@babel/plugin-transform-classes": "^7.20.7",
     "@babel/plugin-transform-regenerator": "^7.20.5",
     "@babel/plugin-transform-runtime": "^7.19.6",
@@ -63,6 +63,7 @@
     "jquery-ui": "^1.13.0",
     "jsrender": "^1.0.9",
     "leaflet.featuregroup.subgroup": "^1.0.2",
+    "marked": "^5.1.2",
     "select2": "^4.1.0-rc.0"
   }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-decidim_awesome
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.3
 platform: ruby
 authors:
 - Ivan Vergés
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-14 00:00:00.000000000 Z
+date: 2023-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
@@ -258,18 +258,14 @@ files:
 - app/views/decidim/decidim_awesome/map_component/map/error.html.erb
 - app/views/decidim/decidim_awesome/map_component/map/show.html.erb
 - app/views/decidim/proposals/admin/proposals/_form.html.erb
-- app/views/decidim/proposals/collaborative_drafts/_edit_form_fields.html.erb
-- app/views/decidim/proposals/collaborative_drafts/show.html.erb
 - app/views/layouts/decidim/_head.html.erb
 - app/views/layouts/decidim/admin/_header.html.erb
 - app/views/layouts/decidim/admin/decidim_awesome.html.erb
 - app/views/layouts/decidim/decidim_awesome/_awesome_config.html.erb
 - app/views/layouts/decidim/decidim_awesome/_custom_styles.html.erb
 - app/views/layouts/decidim/decidim_awesome/_intergram_widget.html.erb
-- app/views/v0.26/decidim/proposals/collaborative_drafts/_show.html.erb
 - app/views/v0.26/layouts/decidim/_head.html.erb
 - app/views/v0.26/layouts/decidim/admin/_header.html.erb
-- app/views/v0.27/decidim/proposals/collaborative_drafts/_show.html.erb
 - app/views/v0.27/layouts/decidim/_head.html.erb
 - app/views/v0.27/layouts/decidim/admin/_header.html.erb
 - config/assets.rb

data/app/views/decidim/proposals/collaborative_drafts/_edit_form_fields.html.erb

@@ -1,75 +0,0 @@
-<%= form_required_explanation %>
-
-<div class="field hashtags__container">
-  <%= form.text_field :title, class: "js-hashtags", value: form_presenter.title %>
-</div>
-
-<div class="field hashtags__container">
-  <%= text_editor_for_proposal_body(form) %>
-</div>
-
-<% if @form.component_automatic_hashtags.any? %>
-  <div class="field">
-    <%= form.label :automatic_hashtags %>
-    <div class="checkboxes hashtags">
-      <% @form.component_automatic_hashtags.each do |hashtag| %>
-        <label>
-          <%= check_box_tag "", "", { checked: true }, { disabled: true } %>#<%= hashtag %>
-        </label>
-      <% end %>
-    </div>
-  </div>
-<% end %>
-
-<% if @form.component_suggested_hashtags.any? %>
-  <div class="field">
-    <%= form.label :suggested_hashtags, nil, for: nil %>
-    <div class="checkboxes hashtags">
-      <%= form.collection_check_boxes :suggested_hashtags, @form.component_suggested_hashtags.map {|hashtag| [hashtag.downcase, "##{hashtag}"]}, :first, :last do |option|
-        option.label { option.check_box(checked: @form.suggested_hashtag_checked?(option.value)) + option.text }
-      end %>
-    </div>
-  </div>
-<% end %>
-
-<% if @form.geocoding_enabled? %>
-  <div class="field">
-    <%= form.check_box :has_address, checked: form_has_address? %>
-  </div>
-
-  <div class="field" id="address_input">
-    <%= form.geocoding_field :address %>
-  </div>
-<% end %>
-
-<% if @form.categories&.any? %>
-  <div class="field">
-    <%= form.categories_select :category_id, @form.categories, include_blank: t("decidim.proposals.collaborative_drafts.edit.select_a_category") %>
-  </div>
-<% end %>
-
-<% if current_component.has_subscopes? %>
-  <div class="field">
-    <%= scopes_picker_field form, :scope_id, root: current_component.scope %>
-  </div>
-<% end %>
-
-<% if current_organization.user_groups_enabled? && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
-  <div class="field">
-    <%= user_group_select_field form, :user_group_id %>
-  </div>
-<% end %>
-
-<% if component_settings.attachments_allowed? %>
-  <fieldset class="attachments_container">
-    <legend><%= t("attachment_legend", scope: "decidim.proposals.collaborative_drafts.edit") %></legend>
-    <div class="row column">
-      <%= form.attachment :documents,
-        multiple: false,
-        label: t("decidim.proposals.collaborative_drafts.new.add_file"),
-        button_label: t("decidim.proposals.collaborative_drafts.new.add_file"),
-        button_edit_label: t("decidim.proposals.collaborative_drafts.new.edit_file"),
-        help_i18n_scope: "decidim.forms.file_help.file" %>
-    </div>
-  </fieldset>
-<% end %>

data/app/views/decidim/proposals/collaborative_drafts/show.html.erb

@@ -1 +0,0 @@
-<%= render partial: "#{version_prefix}/decidim/proposals/collaborative_drafts/show" %>

data/app/views/v0.26/decidim/proposals/collaborative_drafts/_show.html.erb

@@ -1,128 +0,0 @@
-<% add_decidim_page_title(Decidim::Proposals::CollaborativeDraft.model_name.human(count: 2)) %>
-<% add_decidim_meta_tags({
-  description: present(@collaborative_draft).body,
-  title: present(@collaborative_draft).title,
-  url: collaborative_draft_url(@collaborative_draft.id)
-}) %>
-
-<% if current_user.nil? || allowed_to?(:request_access, :collaborative_draft, collaborative_draft: @collaborative_draft) %>
-  <div class="row">
-    <div class="columns">
-      <div class="callout secondary"><%= t("info-message", scope:"decidim.proposals.collaborative_drafts.show").html_safe %></div>
-    </div>
-  </div>
-<% end %>
-
-<div class="row column view-header">
-  <div class="m-bottom">
-    <%= link_to collaborative_drafts_path do %>
-      <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
-      <%= t("back", scope:"decidim.proposals.collaborative_drafts.show") %>
-    <% end %>
-  </div>
-
-  <h2 class="heading2">
-    <%= present(@collaborative_draft).title(links: true, html_escape: true) %>
-  </h2>
-
-  <%= cell("decidim/coauthorships", @collaborative_draft, has_actions: true, size: 3, context: { current_user: current_user }) %>
-</div>
-
-<div class="row">
-  <div class="columns mediumlarge-8 large-9">
-    <div class="section">
-      <%== cell("decidim/proposals/collaborative_draft_m", @collaborative_draft, full_badge: true).badge %>
-
-      <%= render_proposal_body(@collaborative_draft) %>
-
-      <% if component_settings.geocoding_enabled? %>
-        <%= render partial: "decidim/shared/static_map", locals: { icon_name: "proposals", geolocalizable: @collaborative_draft } %>
-      <% end %>
-
-      <%= cell "decidim/tags", @collaborative_draft, context: { extra_classes: ["tags--collaborative-draft"] } %>
-    </div>
-  </div>
-
-  <div class="columns section view-side mediumlarge-4 large-3">
-    <% if allowed_to?(:publish, :collaborative_draft, collaborative_draft: @collaborative_draft) %>
-      <div class="card text-center" id="collaborative_draft_publish">
-        <div class="card__content">
-          <%= cell "decidim/proposals/irreversible_action_modal", @collaborative_draft, action: :publish %>
-          <div class="text-small">
-            <%= t("publish_info", scope:"decidim.proposals.collaborative_drafts.show") %>
-            <%= cell "decidim/proposals/irreversible_action_modal", @collaborative_draft, action: :withdraw %>
-          </div>
-        </div>
-      </div>
-    <% end %>
-
-    <div class="card text-center">
-      <div class="card__content">
-        <% if @collaborative_draft.published? %>
-          <%= cell "decidim/proposals/collaborative_draft_link_to_proposal", @collaborative_draft %>
-        <% else %>
-          <div>
-            <%= resource_version_number(@collaborative_draft.versions_count, "text-large") %>
-            <div class="text-medium">
-              <%= resource_version_of(@collaborative_draft.versions_count) %>
-            </div>
-          </div>
-
-          <div>
-            <span class="text-medium">
-              <%= link_to_other_resource_versions(collaborative_draft_versions_path(@collaborative_draft)) %>
-            </span>
-          </div>
-        <% end %>
-
-        <% if allowed_to?(:edit, :collaborative_draft, collaborative_draft: @collaborative_draft) %>
-          <%= link_to t("edit", scope:"decidim.proposals.collaborative_drafts.show"), edit_collaborative_draft_path(@collaborative_draft), class: "button hollow expanded button--sc mt-s", id: "collaborative_draft_edit" %>
-        <% end %>
-
-        <%= render "request_access_form" %>
-
-        <% if @collaborative_draft.requesters.include? current_user %>
-          <button type="button" class="button expanded button--sc mt-s">
-            <%= t("requested_access", scope:"decidim.proposals.collaborative_drafts.show") %>
-          </button>
-        <% end %>
-      </div>
-
-      <div class="card__status">
-        <ul class="card-data">
-          <li class="card-data__item authors_status">
-            <%= with_tooltip t("decidim.proposals.models.collaborative_draft.fields.authors") do %>
-              <%= icon("people", class: "icon--small", role: "img", "aria-hidden": true) + " " + "#{@collaborative_draft.versions.group_by(&:whodunnit).size}" %>
-            <% end %>
-          </li>
-
-          <li class="card-data__item versions_status">
-            <%= link_to collaborative_draft_versions_path(@collaborative_draft) do %>
-              <%= with_tooltip t("decidim.proposals.models.collaborative_draft.fields.contributions") do %>
-                <%= icon("pencil", class: "icon--small", role: "img", "aria-hidden": true) + " " + "#{@collaborative_draft.versions.count}" %>
-              <% end %>
-            <% end %>
-          </li>
-          <li class="card-data__item">
-            <%= link_to "#comments" do %>
-              <%= with_tooltip t("decidim.proposals.models.collaborative_draft.fields.comments") do %>
-                <%= icon("comment-square", class: "icon--small", role: "img", "aria-hidden": true) + " " + "#{@collaborative_draft.comments_count}" %>
-              <% end %>
-            <% end %>
-          </li>
-        </ul>
-      </div>
-    </div>
-
-    <%= render partial: "collaborator_requests" %>
-
-    <%= resource_reference(@collaborative_draft) %>
-
-    <%= render partial: "decidim/shared/share_modal" %>
-  </div>
-</div>
-
-<%= attachments_for @collaborative_draft %>
-<%= comments_for @collaborative_draft %>
-
-<%= cell("decidim/flag_modal", @collaborative_draft) %>

data/app/views/v0.27/decidim/proposals/collaborative_drafts/_show.html.erb

@@ -1,128 +0,0 @@
-<% add_decidim_page_title(Decidim::Proposals::CollaborativeDraft.model_name.human(count: 2)) %>
-<% add_decidim_meta_tags({
-  description: present(@collaborative_draft).body,
-  title: present(@collaborative_draft).title,
-  url: collaborative_draft_url(@collaborative_draft.id)
-}) %>
-
-<% if current_user.nil? || allowed_to?(:request_access, :collaborative_draft, collaborative_draft: @collaborative_draft) %>
-  <div class="row">
-    <div class="columns">
-      <div class="callout secondary"><%= t("info-message", scope:"decidim.proposals.collaborative_drafts.show").html_safe %></div>
-    </div>
-  </div>
-<% end %>
-
-<div class="row column view-header">
-  <div class="m-bottom">
-    <%= link_to collaborative_drafts_path do %>
-      <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
-      <%= t("back", scope:"decidim.proposals.collaborative_drafts.show") %>
-    <% end %>
-  </div>
-
-  <h2 class="heading2">
-    <%= present(@collaborative_draft).title(links: true, html_escape: true) %>
-  </h2>
-
-  <%= cell("decidim/coauthorships", @collaborative_draft, has_actions: true, size: 3, context: { current_user: current_user }) %>
-</div>
-
-<div class="row">
-  <div class="columns mediumlarge-8 large-9">
-    <div class="section">
-      <%== cell("decidim/proposals/collaborative_draft_m", @collaborative_draft, full_badge: true).badge %>
-
-      <%= render_proposal_body(@collaborative_draft) %>
-
-      <% if component_settings.geocoding_enabled? %>
-        <%= render partial: "decidim/shared/static_map", locals: { icon_name: "proposals", geolocalizable: @collaborative_draft } %>
-      <% end %>
-
-      <%= cell "decidim/tags", @collaborative_draft, context: { extra_classes: ["tags--collaborative-draft"] } %>
-    </div>
-  </div>
-
-  <div class="columns section view-side mediumlarge-4 large-3">
-    <% if allowed_to?(:publish, :collaborative_draft, collaborative_draft: @collaborative_draft) %>
-      <div class="card text-center" id="collaborative_draft_publish">
-        <div class="card__content">
-          <%= cell "decidim/proposals/irreversible_action_modal", @collaborative_draft, action: :publish %>
-          <div class="text-small">
-            <%= t("publish_info", scope:"decidim.proposals.collaborative_drafts.show") %>
-            <%= cell "decidim/proposals/irreversible_action_modal", @collaborative_draft, action: :withdraw %>
-          </div>
-        </div>
-      </div>
-    <% end %>
-
-    <div class="card text-center">
-      <div class="card__content">
-        <% if @collaborative_draft.published? %>
-          <%= cell "decidim/proposals/collaborative_draft_link_to_proposal", @collaborative_draft %>
-        <% else %>
-          <div>
-            <%= resource_version_number(@collaborative_draft.versions_count, "text-large") %>
-            <div class="text-medium">
-              <%= resource_version_of(@collaborative_draft.versions_count) %>
-            </div>
-          </div>
-
-          <div>
-            <span class="text-medium">
-              <%= link_to_other_resource_versions(collaborative_draft_versions_path(@collaborative_draft)) %>
-            </span>
-          </div>
-        <% end %>
-
-        <% if allowed_to?(:edit, :collaborative_draft, collaborative_draft: @collaborative_draft) %>
-          <%= link_to t("edit", scope:"decidim.proposals.collaborative_drafts.show"), edit_collaborative_draft_path(@collaborative_draft), class: "button hollow expanded button--sc mt-s", id: "collaborative_draft_edit" %>
-        <% end %>
-
-        <%= render "request_access_form" %>
-
-        <% if @collaborative_draft.requesters.include? current_user %>
-          <button type="button" class="button expanded button--sc mt-s">
-            <%= t("requested_access", scope:"decidim.proposals.collaborative_drafts.show") %>
-          </button>
-        <% end %>
-      </div>
-
-      <div class="card__status">
-        <ul class="card-data">
-          <li class="card-data__item authors_status">
-            <%= with_tooltip t("decidim.proposals.models.collaborative_draft.fields.authors") do %>
-              <%= icon("people", class: "icon--small", role: "img", "aria-hidden": true) + " " + "#{@collaborative_draft.versions.group_by(&:whodunnit).size}" %>
-            <% end %>
-          </li>
-
-          <li class="card-data__item versions_status">
-            <%= link_to collaborative_draft_versions_path(@collaborative_draft) do %>
-              <%= with_tooltip t("decidim.proposals.models.collaborative_draft.fields.contributions") do %>
-                <%= icon("pencil", class: "icon--small", role: "img", "aria-hidden": true) + " " + "#{@collaborative_draft.versions.count}" %>
-              <% end %>
-            <% end %>
-          </li>
-          <li class="card-data__item">
-            <%= link_to "#comments" do %>
-              <%= with_tooltip t("decidim.proposals.models.collaborative_draft.fields.comments") do %>
-                <%= icon("comment-square", class: "icon--small", role: "img", "aria-hidden": true) + " " + "#{@collaborative_draft.comments_count}" %>
-              <% end %>
-            <% end %>
-          </li>
-        </ul>
-      </div>
-    </div>
-
-    <%= render partial: "collaborator_requests" %>
-
-    <%= resource_reference(@collaborative_draft) %>
-
-    <%= render partial: "decidim/shared/share_modal" %>
-  </div>
-</div>
-
-<%= attachments_for @collaborative_draft %>
-<%= comments_for @collaborative_draft %>
-
-<%= cell("decidim/flag_modal", @collaborative_draft) %>