decidim-admin 0.29.0.rc3 → 0.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3755945bdc10745894992e7421e07e21b4e26dbec55a3a1abff2b1994179d65d
-  data.tar.gz: 93285a182323d16be1c639b99f5fc5ccf495bdce8cb047531c5eb5f5021bb712
+  metadata.gz: d72f8a48c02174cc56994ea7a82d271c105de63b646bea004ab4a8c95aee604b
+  data.tar.gz: 2512e71df6f70ef6d4665d60ebbcda6447fc84eb4205c3c5ed55748754ed5312
 SHA512:
-  metadata.gz: e2eabc789e1c41eb8696e7b05420bbf7211a28ffb7cc6492fe41aedf6da6f7ea126ff5ce014ad86eed98b2aa2cc753effa1ebfb1763967d909576a66dfaf0212
-  data.tar.gz: 4cb4075884fbe8c7e9c2b88de2d5a0218058f749844af0a7107d7e508b394235d914a4455f3f2a5ce1b577434a2e020cd43d4b01bbfca34761063596ad887b57
+  metadata.gz: c06888b0443fa9b435f36fa8f23347acb9539805e1fa4cd20555105afc1e32b7b54f5a5098ada249e755c3ce587b57ce4edb7d6a4f4f3934bc845a1f7419f73b
+  data.tar.gz: 29a63b83a79ed403fd35c6c5c1d45905e8918548a92d4465067796c5eaa0c3dd5ed6d717ec9664a792ea36a43fc8c6389658f2cd645f09959a689307c79ebe5c

data/README.md

@@ -42,19 +42,6 @@ There are some pages that exist by default and cannot be deleted since there
 are links to them inside the Decidim framework, see `Decidim::StaticPage` for
 the default list.
 
-### Pager Configuration
-
-The number of results shown per page and per page range can be configured in the app `decidim.rb` initializer as follows:
-
-```ruby
-Decidim::Admin.configure do |config|
-  config.per_page_range = [15, 50, 100]
-end
-```
-
-* `Decidim::Admin.per_page_range.first` sets the `default_per_page` value for `Decidim::Admin` (in Kaminari)
-* `Decidim::Admin.per_page_range.last` sets the `max_per_page`  value for `Decidim::Admin` (in Kaminari)
-
 ## Contributing
 
 See [Decidim](https://github.com/decidim/decidim).

data/app/commands/decidim/admin/destroy_component.rb

@@ -7,6 +7,7 @@ module Decidim
       private
 
       def run_before_hooks
+        Decidim::Reminder.where(component: resource).destroy_all
         resource.manifest.run_hooks(:before_destroy, resource)
       end
 

data/app/controllers/concerns/decidim/admin/filterable.rb

@@ -9,7 +9,7 @@ module Decidim
       extend ActiveSupport::Concern
 
       included do
-        include Decidim::Admin::Paginable
+        include Decidim::Paginable
         include Decidim::TranslatableAttributes
 
         helper Decidim::Admin::FilterableHelper

data/app/controllers/concerns/decidim/admin/verification_conflicts/filterable.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Admin
+    module VerificationConflicts
+      module Filterable
+        extend ActiveSupport::Concern
+
+        included do
+          include Decidim::Admin::Filterable
+
+          private
+
+          def base_query
+            collection
+          end
+
+          def search_field_predicate
+            :current_user_name_or_current_user_nickname_or_current_user_email_cont
+          end
+
+          def filters
+            []
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/admin/application_controller.rb

@@ -18,6 +18,7 @@ module Decidim
       include Headers::ContentSecurityPolicy
       include DisableRedirectionToExternalHost
       include Decidim::Admin::Concerns::HasBreadcrumbItems
+      include ActiveStorage::SetCurrent
 
       helper Decidim::Admin::ApplicationHelper
       helper Decidim::Admin::AttributesDisplayHelper
@@ -26,7 +27,6 @@ module Decidim
       helper Decidim::Admin::IconWithTooltipHelper
       helper Decidim::Admin::MenuHelper
       helper Decidim::Admin::ScopesHelper
-      helper Decidim::Admin::Paginable::PerPageHelper
       helper Decidim::DecidimFormHelper
       helper Decidim::ReplaceButtonsHelper
       helper Decidim::ScopesHelper

data/app/controllers/decidim/admin/conflicts_controller.rb

@@ -3,18 +3,16 @@
 module Decidim
   module Admin
     class ConflictsController < Decidim::Admin::ApplicationController
+      include Decidim::Admin::VerificationConflicts::Filterable
+
       layout "decidim/admin/users"
 
-      helper_method :context_breadcrumb_items
+      helper_method :context_breadcrumb_items, :conflicts
 
       add_breadcrumb_item_from_menu :impersonate_menu
 
       def index
         enforce_permission_to :index, :impersonatable_user
-
-        @conflicts = Decidim::Verifications::Conflict.joins(:current_user).where(
-          decidim_users: { decidim_organization_id: current_organization.id }
-        )
       end
 
       def edit
@@ -66,6 +64,16 @@ module Decidim
           url: decidim_admin.impersonatable_users_path
         }
       end
+
+      def collection
+        @collection ||= Decidim::Verifications::Conflict.joins(:current_user).where(
+          decidim_users: { decidim_organization_id: current_organization.id }
+        )
+      end
+
+      def conflicts
+        @conflicts ||= filtered_collection.order(created_at: :desc)
+      end
     end
   end
 end

data/app/helpers/decidim/admin/application_helper.rb

@@ -16,6 +16,19 @@ module Decidim
       include Decidim::Admin::ResourceScopeHelper
       include Decidim::Admin::SearchFormHelper
 
+      # Public: Overwrites the `cell` helper method to automatically set some
+      # common context.
+      #
+      # name - the name of the cell to render
+      # model - the cell model
+      # options - a Hash with options
+      #
+      # Renders the cell contents.
+      def cell(name, model, options = {}, &)
+        options = { context: { view_context: self, current_user: } }.deep_merge(options)
+        super
+      end
+
       def participatory_space_active_link?(component)
         endpoints = component.manifest.admin_engine.try(:participatory_space_endpoints)
         endpoints && is_active_link?(decidim_admin_participatory_processes.components_path(current_participatory_space), %r{/\d+/manage/(#{endpoints.join("|")})\b})

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

@@ -19,7 +19,7 @@
               <%= cell("decidim/announcement", t(".already_reported_html"), callout_class: "alert" ) %>
             <% end %>
 
-            <% if defined?(Decidim::Templates) %>
+            <% if Decidim.module_installed?(:templates) %>
               <%= render "decidim/templates/admin/block_user_templates/template_chooser", form: f %>
             <% end %>
 

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

@@ -1,10 +1,32 @@
 <% add_decidim_page_title(t("title", scope: "decidim.admin.conflicts")) %>
-<div class="card">
-  <div class="item_show__header">
-    <h1 class="item_show__header-title">
-      <%= t("title", scope: "decidim.admin.conflicts") %>
-    </h1>
+<div class="item_show__header">
+  <h1 class="item_show__header-title">
+    <%= t("title", scope: "decidim.admin.conflicts") %>
+  </h1>
+</div>
+
+<div class="filters__section">
+  <div class="fcell search">
+    <%= search_form_for(query, url: url_for) do |form| %>
+      <%= applied_filters_hidden_field_tags %>
+      <div class="input-group">
+        <%= form.search_field(
+              search_field_predicate,
+              class: "input-group-field",
+              label: false,
+              placeholder: t(".text")
+            ) %>
+        <div class="input-group-button">
+          <button type="submit" class="text-secondary" aria-label="<%= t("decidim.search.term_input_placeholder") %>">
+            <%= icon "search-line", class: "fill-secondary w-4 h-4" %>
+          </button>
+        </div>
+      </div>
+    <% end %>
   </div>
+</div>
+
+<div class="card">
   <div class="table-scroll">
     <table class="table-list">
       <thead>
@@ -17,7 +39,7 @@
         </tr>
       </thead>
       <tbody>
-        <% @conflicts.each do |conflict| %>
+        <% conflicts.each do |conflict| %>
           <tr>
             <td><%= conflict.current_user.name %></td>
             <td><%= conflict.managed_user.name %></td>
@@ -30,3 +52,4 @@
     </table>
   </div>
 </div>
+<%= decidim_paginate conflicts %>

data/app/views/decidim/admin/organization_appearance/form/_minimap.html.erb

@@ -3,7 +3,7 @@
   <div id="minimap" class="grid grid-cols-1 md:grid-cols-2">
     <div class="minimap-tab">
       <% if current_organization.favicon.attached? %>
-        <%= image_tag current_organization.attached_uploader(:favicon).path, class: "minimap-favicon" %>
+        <%= image_tag current_organization.attached_uploader(:favicon).url, class: "minimap-favicon" %>
       <% else %>
         <%= content_tag :div, nil, { class: "minimap-favicon placeholder", style: "width: #{image_width(current_organization, :favicon) * size_factor}px; height: #{image_height(current_organization, :favicon) * size_factor}px;" } do %>
           <span><%= t("favicon", scope: "activemodel.attributes.organization") %></span>
@@ -13,7 +13,7 @@
 
     <div class="minimap-header">
       <% if current_organization.logo.present? %>
-        <%= image_tag current_organization.attached_uploader(:logo).path, class: "minimap-logo" %>
+        <%= image_tag current_organization.attached_uploader(:logo).url, class: "minimap-logo" %>
       <% else %>
         <%= content_tag :div, nil, { class: "minimap-logo placeholder", style: "width: #{image_width(current_organization, :logo) * size_factor}px; height: #{image_height(current_organization, :logo) * size_factor}px;" } do %>
           <span><%= t("logo", scope: "activemodel.attributes.organization") %></span>
@@ -26,7 +26,7 @@
 
     <div class="minimap-footer">
       <% if current_organization.official_img_footer.attached? %>
-        <%= image_tag current_organization.attached_uploader(:official_img_footer).path, class: "minimap-official_img_footer" %>
+        <%= image_tag current_organization.attached_uploader(:official_img_footer).url, class: "minimap-official_img_footer" %>
       <% else %>
         <%= content_tag :div, nil, { class: "minimap-official_img_footer placeholder", style: "width: #{image_width(current_organization, :official_img_footer) * size_factor}px; height: #{image_height(current_organization, :official_img_footer) * size_factor}px;" } do %>
         <span><%= t("official_img_footer", scope: "activemodel.attributes.organization") %></span>

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

@@ -23,7 +23,7 @@
           <div class="layout-nav">
             <%= link_to decidim_admin.root_path, class: "logo hidden md:block", data: { "external-link": false }, aria: { label: t("decidim.accessibility.logo", organization: current_organization_name) } do %>
               <% if current_organization.logo.present? %>
-                <%= image_tag current_organization.attached_uploader(:logo).path, alt: current_organization_name %>
+                <%= image_tag current_organization.attached_uploader(:logo).url, alt: current_organization_name %>
               <% else %>
                 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 134 109">
                   <g fill="#fff">

data/config/locales/ca.yml

@@ -23,7 +23,7 @@ ca:
       category:
         description: Descripció
         name: Nom
-        parent_id: Pare
+        parent_id: Categoria mare
         weight: Ordre de posició
       component:
         name: Nom
@@ -110,7 +110,7 @@ ca:
         code: Codi
         name: Nom
         organization: Organització
-        parent_id: Pare
+        parent_id: Àmbit pare
         scope_type: Tipus d'àmbit
         scope_type_id: Tipus d'àmbit
       scope_type:
@@ -351,6 +351,8 @@ ca:
       conflicts:
         attempts: Intents
         'false': 'No'
+        index:
+          text: Cercar per correu electrònic, nom o àlies.
         managed_user_name: Usuari gestionat
         solved: Resolt
         title: Conflictes de verificació

data/config/locales/cs.yml

@@ -351,6 +351,8 @@ cs:
       conflicts:
         attempts: Pokusy
         'false': 'Ne'
+        index:
+          text: Hledat podle aktuálního uživatelského e-mailu, jména nebo přezdívky.
         managed_user_name: Spravovaný uživatel
         solved: Vyřešeno
         title: Konflikty ověření
@@ -379,6 +381,11 @@ cs:
           update: Aktualizovat
       dashboard:
         pending_moderations:
+          announcement:
+            one: Je zde %{count} čekající na moderování
+            few: Jsou zde %{count} čekající na moderování
+            many: Je zde %{count} čekajících na moderování
+            other: Je tu %{count} čekajících na moderování
           goto_moderation: Přejít na globální moderaci
           title: Čekající moderování
         show:

data/config/locales/de.yml

@@ -351,6 +351,8 @@ de:
       conflicts:
         attempts: Versuche
         'false': 'Nein'
+        index:
+          text: Suche nach bestehender E-Mail, Name oder Spitzname des Teilnehmenden.
         managed_user_name: Verwalteter Benutzer
         solved: Gelöst
         title: Überprüfungskonflikte

data/config/locales/en.yml

@@ -351,6 +351,8 @@ en:
       conflicts:
         attempts: Attempts
         'false': 'No'
+        index:
+          text: Search by current user email, name or nickname.
         managed_user_name: Managed User
         solved: Solved
         title: Verification conflicts

data/config/locales/es-MX.yml

@@ -351,6 +351,8 @@ es-MX:
       conflicts:
         attempts: Intentos
         'false': 'No'
+        index:
+          text: Buscar por correo electrónico, nombre o alias.
         managed_user_name: Usuario gestionado
         solved: Resuelto
         title: Conflictos de verificación

data/config/locales/es-PY.yml

@@ -351,6 +351,8 @@ es-PY:
       conflicts:
         attempts: Intentos
         'false': 'No'
+        index:
+          text: Buscar por correo electrónico, nombre o alias.
         managed_user_name: Usuario gestionado
         solved: Resuelto
         title: Conflictos de verificación

data/config/locales/es.yml

@@ -23,7 +23,7 @@ es:
       category:
         description: Descripción
         name: Nombre
-        parent_id: Superior
+        parent_id: Categoría madre
         weight: Orden de posición
       component:
         name: Nombre
@@ -110,7 +110,7 @@ es:
         code: Código
         name: Nombre
         organization: Organización
-        parent_id: Superior
+        parent_id: Ámbito padre
         scope_type: Tipo de ámbito
         scope_type_id: Tipo de ámbito
       scope_type:
@@ -351,6 +351,8 @@ es:
       conflicts:
         attempts: Intentos
         'false': 'No'
+        index:
+          text: Buscar por correo electrónico, nombre o alias.
         managed_user_name: Usuario gestionado
         solved: Resuelto
         title: Conflictos de verificación

data/config/locales/eu.yml

@@ -351,6 +351,8 @@ eu:
       conflicts:
         attempts: Saiakerak
         'false': 'Ez'
+        index:
+          text: Bilatu gaur egungo erabiltzailearen posta elektronikoaren, izenaren edo ezizenaren bidez.
         managed_user_name: Erabiltzaile kudeatua
         solved: Ebatzita
         title: Egiaztapen-arazoak

data/config/locales/fi-plain.yml

@@ -319,7 +319,7 @@ fi-pl:
         create:
           error: Tämän komponentin luomisessa tapahtui virhe.
           success: Komponentti luotu onnistuneesti.
-          success_landing_page: Komponentti luotu onnistuneesti. Voit lisätä sisältölohkon tälle komponentille osallistumistilan etusivulle. Siirry <a href="%{landing_page_path}">Laskeutumissivu-osioon</a> lisätäksesi komponentin osallistumistilan etusivulle.
+          success_landing_page: Komponentin luonti onnistui. Voit lisätä sisältölohkon tälle komponentille osallistumistilan etusivulle. Siirry <a href="%{landing_page_path}">Laskeutumissivu-osioon</a> lisätäksesi komponentin osallistumistilan etusivulle.
         destroy:
           error: Tämän komponentin tuhoamisessa tapahtui virhe.
           success: Komponentti poistettu onnistuneesti.
@@ -351,6 +351,8 @@ fi-pl:
       conflicts:
         attempts: Yritykset
         'false': 'Ei'
+        index:
+          text: Etsi nykyisen käyttäjän sähköpostin, nimen tai nimimerkin perusteella.
         managed_user_name: Hallittu käyttäjä
         solved: Ratkaistu
         title: Vahvistusten ristiriidat

data/config/locales/fi.yml

@@ -298,7 +298,7 @@ fi:
           error: Aihepiirin luonti epäonnistui.
           success: Aihepiirin luonti onnistui.
         destroy:
-          error: Tämän aihepiirin poistaminen epäonnistui. Poista ensin kaikki sen ala-aihepiirit ja varmista, että mikään muu kohde ei liity tähän aihepiiriin. Kokeile sen jälkeen uudestaan.
+          error: Tämän aihepiirin poistaminen epäonnistui. Poista ensin kaikki sen ala-aihepiirit ja varmista, että mikään muu kohde ei liity tähän aihepiiriin. Kokeile sen jälkeen uudelleen.
           success: Aihepiirin poistaminen onnistui.
         edit:
           title: Muokkaa aihepiiriä
@@ -319,7 +319,7 @@ fi:
         create:
           error: Komponentin luonti epäonnistui.
           success: Komponentin luonti onnistui.
-          success_landing_page: Komponentti luotu onnistuneesti. Voit lisätä sisältölohkon tälle komponentille osallistumistilan etusivulle. Siirry <a href="%{landing_page_path}">Laskeutumissivu-osioon</a> lisätäksesi komponentin osallistumistilan etusivulle.
+          success_landing_page: Komponentin luonti onnistui. Voit lisätä sisältölohkon tälle komponentille osallistumistilan etusivulle. Siirry <a href="%{landing_page_path}">Laskeutumissivu-osioon</a> lisätäksesi komponentin osallistumistilan etusivulle.
         destroy:
           error: Komponentin tuhoaminen epäonnistui.
           success: Komponentin poisto onnistui.
@@ -351,6 +351,8 @@ fi:
       conflicts:
         attempts: Yritykset
         'false': 'Ei'
+        index:
+          text: Etsi nykyisen käyttäjän sähköpostin, nimen tai nimimerkin perusteella.
         managed_user_name: Hallittu käyttäjä
         solved: Ratkaistu
         title: Vahvistusten ristiriidat
@@ -729,7 +731,7 @@ fi:
       newsletters:
         create:
           error: Uutiskirjeen luonti epäonnistui.
-          success: Uutiskirje luotu onnistuneesti. Tarkasta se ennen lähetystä.
+          success: Uutiskirjeen luonti onnistui. Tarkasta se ennen lähetystä.
         deliver:
           error: Uutiskirjeen toimitus epäonnistui.
           success: Uutiskirjeen toimitus onnistui.
@@ -887,7 +889,7 @@ fi:
       participatory_space_private_users_csv_imports:
         create:
           invalid: CSV-tiedoston lukeminen epäonnistui. Tarkasta, että olet seurannut esitettyjä ohjeita.
-          success: CSV-tiedosto ladattu onnistuneesti. Lähetämme kutsusähköpostin osallistujille. Tämä voi kestää hetken.
+          success: CSV-tiedoston lataus onnistui. Lähetämme kutsusähköpostin osallistujille. Tämä voi kestää hetken.
         new:
           csv_upload:
             title: Lataa CSV-tiedosto
@@ -1042,7 +1044,7 @@ fi:
       user_group:
         csv_verify:
           invalid: CSV-tiedoston käsittely epäonnistui.
-          success: CSV-tiedosto on ladattu onnistuneesti. Vahvistamme kriteerien mukaiset käyttäjäryhmät. Tämä voi kestää hetken.
+          success: CSV-tiedoston lataus onnistui. Vahvistamme kriteerien mukaiset käyttäjäryhmät. Tämä voi kestää hetken.
         reject:
           invalid: Käyttäjäryhmän hylkäys epäonnistui.
           success: Käyttäjäryhmän hylkäys onnistui.

data/config/locales/fr-CA.yml

@@ -351,6 +351,8 @@ fr-CA:
       conflicts:
         attempts: Tentatives
         'false': 'Non'
+        index:
+          text: Recherche par adresse e-mail, nom ou pseudonyme.
         managed_user_name: Utilisateur représenté
         solved: Résolu
         title: Conflits de vérification

data/config/locales/fr.yml

@@ -351,6 +351,8 @@ fr:
       conflicts:
         attempts: Tentatives
         'false': 'Non'
+        index:
+          text: Recherche par adresse e-mail, nom ou pseudonyme.
         managed_user_name: Utilisateur représenté
         solved: Résolu
         title: Conflits de vérification

data/config/locales/ja.yml

@@ -351,6 +351,8 @@ ja:
       conflicts:
         attempts: 試行回数
         'false': 'いいえ'
+        index:
+          text: 現在のユーザーのメールアドレス、名前、ニックネームで検索します。
         managed_user_name: 管理対象ユーザー
         solved: 解決済み
         title: 確認の競合

data/config/locales/ro-RO.yml

@@ -13,7 +13,7 @@ ro:
       attachment:
         attachment_collection_id: Dosar
         description: Descriere
-        file: Fişier
+        file: Fișier
         title: Numele fișierului sau al imaginii atașate
         weight: Poziție
       attachment_collection:
@@ -38,6 +38,9 @@ ro:
         user_group_id: Creează importuri ca
       newsletter:
         body: Conținut
+        send_to_all_users: Trimiteți către toți utilizatorii
+        send_to_followers: Trimiteți către urmăritori
+        send_to_participants: Trimiteți către participanți
         subject: Titlu
       organization:
         admin_terms_of_service_body: Corp pentru condițiile de administrare a serviciului
@@ -126,11 +129,12 @@ ro:
         weight: Poziție
       static_page_topic:
         description: Descriere
+        name: Titlul subiectului
         show_in_footer: Afișează în subsol
         title: Titlu
         weight: Poziție
       user_group_csv_verification:
-        file: Fişier
+        file: Fișier
     errors:
       models:
         newsletter:
@@ -190,6 +194,7 @@ ro:
         per_page: Pe pagină
         permissions: Drepturi
         reject: Respinge
+        send_me_a_test_email: Trimite-mi un e-mail de test
         share: Distribuie
         user:
           new: Administrator nou
@@ -202,7 +207,7 @@ ro:
           accept: Sunt de acord cu termenii
           are_you_sure: Sigur doriți să refuzați termenii de utilizare a serviciului?
           refuse: Refuz termenii
-          title: Ești de acord cu Termenii de Utilizare?
+          title: Sunt de acord cu Termenii de Utilizare
         required_review:
           alert: 'Necesar: Revizuirea actualizărilor termenilor de utilizare a serviciului'
           callout: Vă rugăm să dedicați un moment pentru a revizui Termenii de utilizare pentru admin. În caz contrar, nu veți putea administra platforma.
@@ -282,6 +287,7 @@ ro:
       block_user:
         new:
           action: Blochează contul și trimite justificarea
+          already_reported_html: Continuând cu această acțiune veți ascunde de asemenea conținutul participanților.
           description: Blocarea unui utilizator va face contul său inutilizabil. Poți să furnizezi în justificarea ta orice instrucțiuni cu privire la modul în care vei lua în considerare deblocarea utilizatorului.
           justification: Justificare
           title: Blochează utilizatorul %{name}