decidim-admin 0.26.3 → 0.26.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a33b1f86d32bce28471d7e0cae6d58f3f0b8734e8588543b249f0eae9a187707
-  data.tar.gz: 5ade51348a77a2ba45c95cb747cdf31ea9f743ce2b36753f102ebd6399fc4789
+  metadata.gz: b25e792cc39b3d34099ecaa597e1276fb57edd45ebb88029542789ea2bfe9169
+  data.tar.gz: 52c6be2188c53dbca507274c50a89ecc47a376a5cc49ac827fe17bc37df0c1b3
 SHA512:
-  metadata.gz: 477ee263630fb1af968f73a922d899819908e60faa909e13ed3c585404b9e4c09fe4dd83bf4c458f1ff62a4e7844e6d663e28f32ed64ad9d7475f5ab5632b463
-  data.tar.gz: eaae371f50ec70b88bc4805a16157aee750bcc8a1b0edcc924f35ea8b4dd434759d36a33874147402c181bf87c6da60cd231bdf3fc97e2222f38cd53a7968412
+  metadata.gz: 90617f1562b04639329aa21eb88a54cdb0e29e258754ea6385f648604f90682b4ad8f9d69dea344e98321dd7272da8fe90f444e86275568b0cc35a778186e48a
+  data.tar.gz: 6212034bacccfa62cacff1f1c326076f54a5a1bfb5a1127786cc0cad83b9a5bd96a4507535a1fe65365c0eeae0f94f1d20fc0f983aed822a7563f11b69134efd

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

@@ -39,7 +39,7 @@ module Decidim
           @blocked_user.blocked = false
           @blocked_user.blocked_at = nil
           @blocked_user.block_id = nil
-          @blocked_user.name = @blocked_user.user_name
+          @blocked_user.name = @blocked_user.extended_data["user_name"]
           @blocked_user.save!
         end
       end

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

@@ -21,7 +21,7 @@ module Decidim
         BlockUser.call(@form) do
           on(:ok) do
             flash[:notice] = I18n.t("officializations.block.success", scope: "decidim.admin")
-            redirect_to officializations_path(q: { name_or_nickname_or_email_cont: user.name }), notice: notice
+            redirect_to moderated_users_path(blocked: true), notice: notice
           end
 
           on(:invalid) do
@@ -44,13 +44,13 @@ module Decidim
           end
         end
 
-        redirect_to officializations_path(q: { name_or_nickname_or_email_cont: user.name }), notice: notice
+        redirect_to moderated_users_path(blocked: false), notice: notice
       end
 
       private
 
       def user
-        @user ||= Decidim::User.find_by(
+        @user ||= Decidim::UserBaseEntity.find_by(
           id: params[:user_id],
           organization: current_organization
         )

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

@@ -15,7 +15,7 @@ module Decidim
       def show; end
 
       def preview
-        email = NewsletterMailer.newsletter(current_user, fake_newsletter)
+        email = NewsletterMailer.newsletter(current_user, fake_newsletter, preview: true)
         Premailer::Rails::Hook.perform(email)
         render html: email.html_part.body.decoded.html_safe
       end

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

@@ -28,7 +28,7 @@ module Decidim
       def preview
         enforce_permission_to :read, :newsletter, newsletter: newsletter
 
-        email = NewsletterMailer.newsletter(current_user, newsletter)
+        email = NewsletterMailer.newsletter(current_user, newsletter, preview: true)
         Premailer::Rails::Hook.perform(email)
         render html: email.html_part.body.decoded.html_safe
       end

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

@@ -15,6 +15,7 @@ module Decidim
       def update
         enforce_permission_to :update, :organization, organization: current_organization
         @form = form(OrganizationForm).from_params(params)
+        @form.id = current_organization.id
 
         UpdateOrganization.call(current_organization, @form) do
           on(:ok) do

data/app/forms/decidim/admin/block_user_form.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module Admin
-    # A form object used to officialize users from the admin dashboard.
+    # A form object used to block users or user groups on the admin dashboard.
     class BlockUserForm < Form
       attribute :user_id, Integer
       attribute :justification, String
@@ -15,7 +15,7 @@ module Decidim
       end
 
       def user
-        @user ||= Decidim::User.find_by(
+        @user ||= Decidim::UserBaseEntity.find_by(
           id: user_id,
           organization: current_organization
         )

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

@@ -14,9 +14,8 @@ module Decidim
       # Returns a String.
       def bulk_categories_select(collection)
         categories = bulk_categories_for_select collection
-        disabled = bulk_disabled_categories_for collection
         prompt = t("decidim.proposals.admin.proposals.index.change_category")
-        select(:category, :id, options_for_select(categories, selected: [], disabled: disabled), prompt: prompt)
+        select(:category, :id, options_for_select(categories, selected: []), prompt: prompt)
       end
 
       def bulk_categories_for_select(scope)
@@ -39,10 +38,6 @@ module Decidim
         end
       end
 
-      def bulk_disabled_categories_for(scope)
-        scope.first_class.joins(:subcategories).pluck(:id)
-      end
-
       # Public: Generates a select field with the components.
       #
       # siblings - A collection of components.

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

@@ -41,6 +41,26 @@ module Decidim
         nil
       end
 
+      def draft?
+        true
+      end
+
+      def url(**_)
+        "#"
+      end
+
+      def notifications_settings_url(**_)
+        "#"
+      end
+
+      def unsubscribe_newsletters_url(**_)
+        "#"
+      end
+
+      def organization_official_url
+        "#"
+      end
+
       private
 
       attr_reader :organization, :manifest

data/app/packs/stylesheets/decidim/admin/modules/_modules.scss

@@ -29,7 +29,6 @@
 @import "stylesheets/decidim/admin/modules/agenda";
 @import "stylesheets/decidim/admin/modules/draggable-list";
 @import "stylesheets/decidim/admin/modules/loading-spinner";
-@import "stylesheets/decidim/admin/modules/import_result";
 @import "stylesheets/decidim/admin/modules/reveal";
 
 // mentions__container

data/app/permissions/decidim/admin/permissions.rb

@@ -29,12 +29,14 @@ module Decidim
         read_admin_dashboard_action?
         apply_newsletter_permissions_for_admin!
 
-        allow! if permission_action.subject == :global_moderation
+        apply_global_moderations_permission_for_admin!
 
         if user.admin? && admin_terms_accepted?
           allow! if read_admin_log_action?
+          allow! if read_user_statistics_action?
           allow! if read_metrics_action?
           allow! if static_page_action?
+          allow! if templates_action?
           allow! if organization_action?
           allow! if user_action?
 
@@ -76,6 +78,23 @@ module Decidim
         toggle_allow(user.admin? || space_allows_admin_access_to_current_action?)
       end
 
+      def apply_global_moderations_permission_for_admin!
+        return unless admin_terms_accepted?
+        return unless permission_action.subject == :global_moderation
+        return allow! if user.admin?
+
+        return allow! if Decidim.participatory_space_manifests.flat_map.any? do |manifest|
+          Decidim
+                         .find_participatory_space_manifest(manifest.name)
+                         .participatory_spaces
+                         .call(user.organization)&.any? do |space|
+            space.respond_to?(:user_roles) && space.user_roles(:admin).where(user: user).or(space.user_roles(:moderator).where(user: user)).any?
+          end
+        end
+
+        disallow!
+      end
+
       def apply_newsletter_permissions_for_admin!
         return unless admin_terms_accepted?
         return unless permission_action.subject == :newsletter
@@ -101,6 +120,11 @@ module Decidim
         end
       end
 
+      def read_user_statistics_action?
+        permission_action.subject == :users_statistics &&
+          permission_action.action == :read
+      end
+
       def read_metrics_action?
         permission_action.subject == :metrics &&
           permission_action.action == :read
@@ -128,6 +152,11 @@ module Decidim
         end
       end
 
+      def templates_action?
+        permission_action.subject == :templates &&
+          permission_action.action == :read
+      end
+
       def organization_action?
         return unless permission_action.subject == :organization
         return unless permission_action.action == :update
@@ -139,6 +168,7 @@ module Decidim
         return unless permission_action.subject == :managed_user
         return user_manager_permissions if user_manager?
         return unless user&.admin?
+        return unless user&.admin_terms_accepted?
 
         case permission_action.action
         when :create
@@ -183,7 +213,7 @@ module Decidim
 
       def space_allows_admin_access_to_current_action?(require_admin_terms_accepted: false)
         Decidim.participatory_space_manifests.any? do |manifest|
-          next if manifest.name != :initiatives && require_admin_terms_accepted && !admin_terms_accepted?
+          next if require_admin_terms_accepted && !admin_terms_accepted?
 
           new_permission_action = Decidim::PermissionAction.new(
             action: permission_action.action,

data/app/views/decidim/admin/dashboard/show.html.erb

@@ -12,7 +12,7 @@
   <% end %>
 
   <div class="grid-x grid-margin-x">
-    <% if current_user.admin? && current_user.organization&.id == current_organization.id %>
+    <% if allowed_to? :read, :users_statistics %>
       <div class="cell small-12 medium-6 large-4">
         <%= render(
           partial: "decidim/admin/users_statistics/users_count",

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

@@ -34,7 +34,7 @@
             <legend>
               <%= t(".file_legend", valid_mime_types: mime_types.values.join(", ")).html_safe %>
               <div class="guidance">
-                <%= import_manifest.message(:help, self) %>
+                <%= import_manifest.message(:help, self).html_safe %>
               </div>
             </legend>
             <div class="row column">

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

@@ -60,7 +60,7 @@
             </td>
 
             <td class="actions">
-              <% if allowed_to?(:unreport, :moderate_users) %>
+              <% if !moderation.user.blocked? && allowed_to?(:unreport, :moderate_users) %>
                 <%= icon_link_to "action-undo", ignore_moderated_user_path(id: moderation), t(".actions.unreport"), class: "action-icon--unreport", method: :put %>
               <% end %>
               <% if allowed_to?(:block, :moderate_users) %>

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

@@ -37,7 +37,7 @@
             <tr data-id="<%= moderation.id %>">
               <td><%= moderation.reportable.id %></td>
               <td>
-                <%= moderation.reportable.class.name.demodulize %>
+                <%= moderation.reportable.class.model_name.human %>
               </td>
               <% if !respond_to?(:current_participatory_space) %>
                 <td>
@@ -48,9 +48,13 @@
                 <%= moderation.report_count %>
               </td>
               <td>
-                <%=
-                  link_to t("models.moderation.fields.visit_url", scope: "decidim.moderations"), moderation.reportable.reported_content_url, data: { tooltip: true }, title: strip_tags(reported_content_excerpt_for(moderation.reportable, limit: 250))
-                %>
+                <% if (reportable_url = moderation.reportable.reported_content_url) %>
+                  <%=
+                    link_to t("models.moderation.fields.visit_url", scope: "decidim.moderations"), reportable_url, data: { tooltip: true }, title: strip_tags(reported_content_excerpt_for(moderation.reportable, limit: 250))
+                  %>
+                <% else %>
+                  <%= t("models.moderation.fields.deleted_resource", scope: "decidim.moderations") %>
+                <% end %>
               </td>
               <td>
                 <% reports = moderation.reports.map { |report| render "report", report: report } %>

data/app/views/decidim/admin/moderations/reports/index.html.erb

@@ -12,7 +12,11 @@
     </div>
     <dl>
       <dt><%= t("models.moderation.fields.reported_content_url", scope: "decidim.moderations") %></dt>
-      <dd><%= link_to moderation.reportable.reported_content_url, moderation.reportable.reported_content_url, target: "_blank" %></dd>
+      <% if (reportable_url = moderation.reportable.reported_content_url) %>
+        <dd><%= link_to moderation.reportable.reported_content_url, reportable_url, target: "_blank" %></dd>
+      <% else %>
+        <dd><%= t("models.moderation.fields.deleted_resource", scope: "decidim.moderations") %></dd>
+      <% end %>
 
       <dt><%= t("models.moderation.fields.reportable_id", scope: "decidim.moderations") %></dt>
       <dd><%= moderation.reportable.id %></dd>

data/config/locales/ar.yml

@@ -10,34 +10,41 @@ ar:
         organization: المنظمة
         plural: صيغة الجمع
       attachment:
-        attachment_collection_id: المجلد
+        attachment_collection_id: الحافظة
         description: الوصف
         file: ملف
         title: المُرفق أو اسم الصورة
+        weight: موضع الطلب
       attachment_collection:
         description: الوصف
         name: اسم
+        weight: موضع الطلب
       category:
         description: الوصف
         name: اسم
-        parent_id: الأبوين
+        parent_id: الأصل
+        weight: موضع الطلب
       component:
         name: اسم
-        published_at: نشرت في
+        published_at: نشر في
         weight: موضع الطلب
-      id: هوية شخصية
+      external_domain:
+        value: القيمة
+      help_section:
+        content: المحتوى
+      id: المعرف ID
       import:
-        user_group_id: إنشاء واردات ك
+        user_group_id: إنشاء الاستيرادات ك
       newsletter:
-        body: المحتوى
+        body: النص
         subject: الموضوع
       organization:
         admin_terms_of_use_body: نص شروط الاستخدام للمدير
         alert_color: تنبيه
         available_authorizations: التراخيص المتاحة
         badges_enabled: تمكين الشارات
-        comments_max_length: الحد الأقصى لطول التعليقات (اترك 0 لاستعمال للقيمة الافتراضية)
-        cta_button_path: دعوة إلى العمل مسار زر
+        comments_max_length: الحد الأقصى لطول التعليقات (اترك 0 لاستعمال القيمة الافتراضية)
+        cta_button_path: مسار زر دعوة إلى العمل call to action
         cta_button_text: نص زر Call To Action
         customize_welcome_notification: تخصيص إشعار الترحيب
         default_locale: اللغة الافتراضية
@@ -159,7 +166,6 @@ ar:
         accept:
           success: رائع! لقد قمت بالموافقة على شروط الإستخدام للمدير.
         actions:
-          accept: أوافق على شروط الإستخدام التالية
           refuse: ارفض شروط المدير
           title: وافق على شروط وأحكام الإستخدام
         required_review:
@@ -742,7 +748,7 @@ ar:
           title: مشارك جديد الفضاء الخاص المشارك.
       participatory_space_private_users_csv_imports:
         create:
-          invalid: حدثت مشكلة أثناء قراءة ملف CSV.
+          invalid: حدثت مشكلة في قراءة ملف CSV.
         new:
           title: حمّل ملف CSV الخاص بك
           upload: حمّل
@@ -929,7 +935,7 @@ ar:
             report_count: عد
             reportable_type: النوع
             reported_content_url: تم الإبلاغ عن عنوان URL للمحتوى
-            reports: تقارير
+            reports: التقارير
             visit_url: زيارة العنوان الشبكي
         report:
           fields:
@@ -942,8 +948,6 @@ ar:
   layouts:
     decidim:
       admin:
-        global_moderations:
-          title: مُشرف عام
         newsletters:
           title: النشرات الإخبارية
         settings:

data/config/locales/ca.yml

@@ -14,17 +14,24 @@ ca:
         description: Descripció
         file: Arxiu
         title: Nom de l'adjunt o imatge
+        weight: Ordre de posició
       attachment_collection:
         description: Descripció
         name: Nom
+        weight: Ordre de posició
       category:
         description: Descripció
         name: Nom
         parent_id: Pare
+        weight: Ordre de posició
       component:
         name: Nom
         published_at: Publicat el
         weight: Ordre de posició
+      external_domain:
+        value: Valor
+      help_section:
+        content: Contingut
       id: ID
       import:
         user_group_id: Importar com
@@ -77,7 +84,7 @@ ca:
         organization_admin_name: Nom de l'administradora de l'organització
         organization_locales: Idiomes de l'organització
         primary_color: Primària
-        reference_prefix: prefix de referència
+        reference_prefix: Prefix de referència
         rich_text_editor_in_public_views: Habilitar l'editor de text enriquit
         secondary_color: Secundari
         secondary_hosts: Hosts secundaris
@@ -92,6 +99,9 @@ ca:
         welcome_notification_body: Cos de la notificació de benvinguda
         welcome_notification_subject: Assumpte de la notificació de benvinguda
         youtube_handler: Nom d'usuària de YouTube
+      participatory_space_private_user:
+        email: Correu electrònic
+        name: Nom
       scope:
         code: Codi
         name: Nom
@@ -113,6 +123,7 @@ ca:
         show_in_footer: Mostra al peu de pàgina
         slug: Nom curt d'URL
         title: Títol
+        topic_id: Assumpte
         weight: Ordre de posició
       static_page_topic:
         description: Descripció
@@ -184,7 +195,7 @@ ca:
           error: S'ha produït un error en acceptar els Termes i Condicions dell panell d'administració.
           success: Genial! Has acceptat els Termes i Condicions del panell d'administració.
         actions:
-          accept: Estic d'acord amb els termes següents
+          accept: Estic d'acord amb els termes
           are_you_sure: Segur que vols rebutjar els termes i condicions del panell d'administració?
           refuse: Rebutjar els termes
           title: Accepto els Termes i Condicions d'Administració
@@ -704,7 +715,7 @@ ca:
         select_recipients_to_deliver:
           all_spaces: Totes
           all_users_help: Envia el butlletí a tots els usuaris confimats.
-          confirm_deliver: Estàs segura que vols enviar aquest butlletí? Aquesta acció no es pot desfer.
+          confirm_deliver: Segur que vols enviar aquest butlletí? Aquesta acció no es pot desfer.
           deliver: Enviar butlletí
           followers_help: Envia el butlletí a tots els usuaris confirmats que segueixin qualsevol dels espais participatius seleccionats a la llista.
           none: Cap
@@ -816,7 +827,7 @@ ca:
           inactive_content_blocks: Blocs de contingut inactiu
       organization_homepage_content_blocks:
         edit:
-          update: Actualitza
+          update: Actualitzar
       participatory_space_private_users:
         create:
           error: S'ha produït un error en afegir una participant privada a aquest espai de participació.
@@ -1039,13 +1050,14 @@ ca:
         moderation:
           fields:
             created_at: Data de creació
+            deleted_resource: Recurs eliminat
             hidden_at: Data d'ocultació
             participatory_space: Espai de participació
             report_count: Recompte
             reportable_id: ID
             reportable_type: Tipus
             reported_content_url: URL contingut del contingut reportat
-            reports: Denúncies
+            reports: Informes
             visit_url: Visiteu l'URL
         report:
           fields:

data/config/locales/cs.yml

@@ -14,17 +14,24 @@ cs:
         description: Popis
         file: Soubor
         title: Název přílohy nebo obrázku
+        weight: Pozice v řazení
       attachment_collection:
         description: Popis
         name: Název
+        weight: Pozice v řazení
       category:
         description: Popis
         name: Název
         parent_id: Nadřazená
+        weight: Pozice v řazení
       component:
         name: Název
         published_at: Publikováno v
         weight: Pozice v řazení
+      external_domain:
+        value: Hodnota
+      help_section:
+        content: Obsah
       id: ID
       import:
         user_group_id: Vytvořit importy jako
@@ -92,6 +99,9 @@ cs:
         welcome_notification_body: Tělo uvítacího oznámení
         welcome_notification_subject: Předmět uvítacího oznámení
         youtube_handler: YouTube handler
+      participatory_space_private_user:
+        email: E-mail
+        name: Název
       scope:
         code: Kód
         name: Název
@@ -113,6 +123,7 @@ cs:
         show_in_footer: Zobrazit v zápatí
         slug: URL slug
         title: Titul
+        topic_id: Téma
         weight: Pozice v řazení
       static_page_topic:
         description: Popis
@@ -184,7 +195,7 @@ cs:
           error: Při přijímání správcovských podmínek použití došlo k chybě.
           success: Skvělé! Přijali jste administrátorské podmínky použití.
         actions:
-          accept: Souhlasím s následujícími podmínkami
+          accept: Souhlasím s podmínkami
           are_you_sure: Opravdu chcete odmítnout Podmínky použití pro správce?
           refuse: Odmítnout administrátorské podmínky
           title: Souhlasit s podmínkami používání
@@ -1046,14 +1057,15 @@ cs:
       models:
         moderation:
           fields:
-            created_at: Datum vytvoření
+            created_at: Datum vzniku
+            deleted_resource: Smazaný dokument
             hidden_at: Skryté u
             participatory_space: Participativní prostor
             report_count: Spočítat
             reportable_id: ID
             reportable_type: Typ
             reported_content_url: Oznámená adresa URL obsahu
-            reports: Zprávy
+            reports: Hlášení
             visit_url: Navštívit URL
         report:
           fields:

data/config/locales/de.yml

@@ -14,17 +14,24 @@ de:
         description: Beschreibung
         file: Datei
         title: Anhang oder Bildname
+        weight: Reihenfolge
       attachment_collection:
         description: Beschreibung
         name: Name
+        weight: Reihenfolge
       category:
         description: Beschreibung
         name: Name
         parent_id: Übergeordnete Kategorie
+        weight: Reihenfolge
       component:
         name: Name
         published_at: Veröffentlicht unter
-        weight: Bestellposition
+        weight: Reihenfolge
+      external_domain:
+        value: Wert
+      help_section:
+        content: Inhalt
       id: ID
       import:
         user_group_id: Importierte Inhalte erstellen als
@@ -92,6 +99,9 @@ de:
         welcome_notification_body: Text der Willkommens-Benachrichtigung
         welcome_notification_subject: Betreff der Willkommens-Benachrichtigung
         youtube_handler: YouTube-Handler
+      participatory_space_private_user:
+        email: E-Mail
+        name: Name
       scope:
         code: Code
         name: Name
@@ -113,12 +123,13 @@ de:
         show_in_footer: In der Fußzeile anzeigen
         slug: URL-Block
         title: Titel
-        weight: Bestellposition
+        topic_id: Thema
+        weight: Reihenfolge
       static_page_topic:
         description: Beschreibung
         show_in_footer: In der Fußzeile anzeigen
         title: Titel
-        weight: Bestellposition
+        weight: Reihenfolge
       user_group_csv_verification:
         file: Datei
     errors:
@@ -184,7 +195,6 @@ de:
           error: Beim Akzeptieren der Nutzungsbedingungen ist ein Fehler aufgetreten.
           success: Super! Sie haben die Admin-Nutzungsbedingungen akzeptiert.
         actions:
-          accept: Ich stimme den folgenden Bedingungen zu
           are_you_sure: Sind Sie sicher, dass Sie die Admin-Nutzungsbedingungen ablehnen möchten?
           refuse: Die Admin-Nutzungsbedingungen ablehnen
           title: Den Admin-Nutzungsbedingungen zustimmen

data/config/locales/el.yml

@@ -179,7 +179,6 @@ el:
           error: Υπήρξε ένα σφάλμα κατά την αποδοχή των όρων χρήσης διαχειριστή.
           success: Εξαιρετικά! Αποδεχτήκατε τους όρους χρήσης διαχειριστή.
         actions:
-          accept: Συμφωνώ με τους ακόλουθους όρους
           are_you_sure: Είστε σίγουρος ότι θέλετε να αρνηθείτε τους όρους χρήσης του διαχειριστή;
           refuse: Απόρριψη των όρων διαχειριστή
           title: Αποδοχή των όρων και των προϋποθέσεων χρήσης