decidim-templates 0.28.0.rc5 → 0.28.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01b59ab81e7cef96eb0b0e7a37e482c68a7e539b8cd77eb717441494999ccebf
-  data.tar.gz: 22e16f52d3f2eae4bf4503c4e3313ad63c82edcca2ddb036f97bac3227a1d38e
+  metadata.gz: 4a014a416d363441ef2bfc5682c2b069132963795dbbf25099b8347a56195d22
+  data.tar.gz: 25234dab78eb65177b52c380541419037a6fd2ae433aa403132ee13ee2735564
 SHA512:
-  metadata.gz: becb2b42fc5756c66ee54b7f2d5ad69a2e1337c11a546ca0f203ca7855ff879937609414a4465b7ddb50e7962258f3290a15867f727f5db3b6926a4836f0dccd
-  data.tar.gz: 91b316dab39eb7d0af5dc7b22bbc286139d9ab6120d5ef340d8402a03375533fe4209499343c50c34e71790ad90669bf9ca87d250da3f02d2ad379dca4623285
+  metadata.gz: 61179f335f55af878c96ad6586c823355e7e0f78c08838b31d069c44f58b9efc5ea091a8def531a339da8db8f044fe71f596952e9643f13acf979fa27ca90a6c
+  data.tar.gz: 51b833fa9ea3cc1af8b2c142de4d14fa83deb8528989c5f42144bccbe642abf073900ccb7f26e2f6875b595e0486dac60dfa6b45c4875dfc13ac19e09eb2d8c8

data/app/controllers/decidim/templates/admin/block_user_templates_controller.rb

@@ -7,6 +7,8 @@ module Decidim
         include Decidim::TranslatableAttributes
         include Decidim::Paginable
 
+        add_breadcrumb_item_from_menu :admin_template_types_menu
+
         def fetch
           enforce_permission_to(:read, :template, template:)
 

data/app/controllers/decidim/templates/admin/proposal_answer_templates_controller.rb

@@ -9,6 +9,8 @@ module Decidim
 
         helper_method :availability_option_as_text, :availability_options_for_select
 
+        add_breadcrumb_item_from_menu :admin_template_types_menu
+
         def new
           enforce_permission_to :create, :template
           @form = form(ProposalAnswerTemplateForm).instance
@@ -49,7 +51,9 @@ module Decidim
         end
 
         def fetch
-          enforce_permission_to(:read, :template, template:)
+          enforce_permission_to(:read, :template, template:, proposal:)
+
+          return render json: { msg: I18n.t("templates.fetch.error", scope: "decidim.admin") }, status: :unprocessable_entity if template.blank?
 
           response_object = {
             state: template.field_values["internal_state"],

data/app/controllers/decidim/templates/admin/questionnaire_templates_controller.rb

@@ -10,6 +10,8 @@ module Decidim
 
         helper_method :template
 
+        add_breadcrumb_item_from_menu :admin_template_types_menu
+
         def index
           enforce_permission_to :index, :templates
           @templates = collection

data/app/packs/src/decidim/templates/admin/proposal_answer_template_chooser.js

@@ -2,7 +2,6 @@
 document.addEventListener("DOMContentLoaded", () => {
   const proposalAnswerTemplateChooser = document.getElementById("proposal_answer_template_chooser");
   if (proposalAnswerTemplateChooser) {
-
     proposalAnswerTemplateChooser.addEventListener("change", () => {
       const dropdown =  document.getElementById("proposal_answer_template_chooser");
       const url = dropdown.getAttribute("data-url");
@@ -13,7 +12,12 @@ document.addEventListener("DOMContentLoaded", () => {
         return;
       }
       fetch(`${new URL(url).pathname}?${new URLSearchParams({ id: templateId, proposalId: proposalId })}`).
-        then((response) => response.json()).
+        then((response) => {
+          if (response.ok) {
+            return response.json();
+          }
+          return Promise.reject(response);
+        }).
         then((data) => {
           document.getElementById(`proposal_answer_internal_state_${data.state}`).click();
 
@@ -24,8 +28,15 @@ document.addEventListener("DOMContentLoaded", () => {
 
             editor.commands.setContent(value, true);
           }
-        })
+        }).
+        catch((response) => {
+          response.json().then((data) => {
+            const el = document.createElement("p");
+            el.classList.add("text-alert");
+            el.textContent = data.msg;
+            dropdown.after(el);
+          });
+        });
     });
-
   }
 });

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

@@ -5,21 +5,43 @@ module Decidim
     module Admin
       class Permissions < Decidim::DefaultPermissions
         def permissions
-          return permission_action unless user
-          return permission_action unless user.admin?
           return permission_action if permission_action.scope != :admin
+          return permission_action unless user
+          return permission_action if context[:current_organization] != user.organization
 
-          case permission_action.subject
-          when :template
-            allow! if [:read, :create, :update, :destroy, :copy].include? permission_action.action
-          when :templates
-            allow! if permission_action.action == :index
-          when :questionnaire
+          if user_has_a_role? && (permission_action.subject == :template && permission_action.action == :read)
             allow!
+          else
+            return permission_action unless user.admin?
+
+            case permission_action.subject
+            when :template
+              allow! if [:read, :create, :update, :destroy, :copy].include? permission_action.action
+            when :templates
+              allow! if permission_action.action == :index
+            when :questionnaire
+              allow!
+            end
           end
 
           permission_action
         end
+
+        private
+
+        def participatory_space
+          @participatory_space ||= context[:proposal].try(:participatory_space)
+        end
+
+        def user_roles
+          @user_roles ||= participatory_space.try(:user_roles)
+        end
+
+        def user_has_a_role?
+          return unless user_roles
+
+          user_roles.exists?(user:)
+        end
       end
     end
   end

data/app/views/decidim/templates/admin/block_user_templates/edit.html.erb

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t(".title") %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">

data/app/views/decidim/templates/admin/block_user_templates/index.html.erb

@@ -1,12 +1,12 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="card">
   <div class="item_show__header">
-    <h2 class="item_show__header-title">
+    <h1 class="item_show__header-title">
       <%= t ".title" %>
       <% if allowed_to?(:create, :template) %>
         <%= link_to t("actions.new_template", scope: "decidim.admin.templates"), [:new, :block_user_template], class: "button button__sm button__secondary new" %>
       <% end %>
-    </h2>
+    </h1>
   </div>
   <% if @templates.any? %>
     <div class="table-scroll">

data/app/views/decidim/templates/admin/block_user_templates/new.html.erb

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t(".title") %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">

data/app/views/decidim/templates/admin/proposal_answer_templates/edit.html.erb

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t(".title") %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">

data/app/views/decidim/templates/admin/proposal_answer_templates/index.html.erb

@@ -2,12 +2,12 @@
 
 <div class="card">
   <div class="item_show__header">
-    <h2 class="item_show__header-title">
+    <h1 class="item_show__header-title">
       <%= t ".title" %>
       <% if allowed_to?(:create, :template) %>
         <%= link_to t("actions.new_template", scope: "decidim.admin.templates"), [:new, :proposal_answer_template], class: "button button__sm button__secondary new" %>
       <% end %>
-    </h2>
+    </h1>
   </div>
   <% if @templates.any? %>
     <div class="table-scroll">

data/app/views/decidim/templates/admin/proposal_answer_templates/new.html.erb

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t(".title") %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">

data/app/views/decidim/templates/admin/questionnaire_templates/_choose.html.erb

@@ -1,10 +1,10 @@
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= form_title %>
     <div class="ml-auto">
       <%= link_to t(".skip_template"), decidim_admin_templates.skip_questionnaire_templates_path(questionnaire_id: questionnaire, url: request.url), class: "button button__sm button__secondary", method: :post %>
     </div>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">

data/app/views/decidim/templates/admin/questionnaire_templates/_preview.html.erb

@@ -6,7 +6,7 @@
 </div>
 
 <div class="row columns">
-  <%= decidim_form_for(@preview_form, url: "", method: :post, html: { class: "form form-defaults answer-questionnaire" }, data: { "safe-path" => "" }) do |form| %>
+  <%= decidim_form_for(@preview_form, url: "", method: :post, authenticity_token: !defined?(skip_authenticity_token), html: { class: "form form-defaults answer-questionnaire" }, data: { "safe-path" => "" }) do |form| %>
     <%= invisible_captcha %>
     <% answer_idx = 0 %>
     <% cleaned_answer_idx = 0 %>

data/app/views/decidim/templates/admin/questionnaire_templates/edit.html.erb

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t(".title") %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">

data/app/views/decidim/templates/admin/questionnaire_templates/index.html.erb

@@ -1,12 +1,12 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="card">
   <div class="item_show__header">
-    <h2 class="item_show__header-title">
+    <h1 class="item_show__header-title">
       <%= t ".title" %>
       <% if allowed_to?(:create, :template) %>
         <%= link_to t("actions.new_template", scope: "decidim.admin.templates"), [:new, :questionnaire_template], class: "button button__sm button__secondary new" %>
       <% end %>
-    </h2>
+    </h1>
   </div>
   <% if @templates.any? %>
     <div class="table-scroll">

data/app/views/decidim/templates/admin/questionnaire_templates/new.html.erb

@@ -1,9 +1,9 @@
 <% add_decidim_page_title(t(".title")) %>
 <% add_decidim_page_title(t("templates", scope: "decidim.admin.titles")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t(".title") %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">

data/app/views/decidim/templates/admin/questionnaire_templates/preview.js.erb

@@ -7,7 +7,7 @@
   $templateName.html("<%= translated_attribute @template.name %>");
   $templateDescription.html("<%= translated_attribute @template.description %>");
 
-  $preview.html("<%= j(render partial: "preview", locals: { questionnaire: @questionnaire }) %>");
+  $preview.html("<%= j(render partial: "preview", locals: { skip_authenticity_token: true, questionnaire: @questionnaire }) %>");
 
   var $container = $(".questionnaire-template-preview");
   $container.removeClass("hide");

data/config/locales/bg.yml

@@ -1 +1,112 @@
+---
 bg:
+  activemodel:
+    attributes:
+      questionnaire:
+        title: Заглавие
+      template:
+        description: Описание
+        name: Име
+  decidim:
+    admin:
+      menu:
+        templates: Шаблони
+      templates:
+        actions:
+          new_template: Нов шаблон
+        apply:
+          error: Възникна проблем при прилагането на този шаблон.
+          success: Шаблонът е приложен успешно.
+        copy:
+          error: Възникна проблем при копирането на този шаблон.
+          success: Шаблонът е копиран успешно.
+        create:
+          error: Възникна проблем при създаването на този шаблон.
+          success: Шаблонът е създаден успешно.
+        destroy:
+          success: Шаблонът е изтрит успешно.
+        empty: Все още няма шаблони.
+        missing_resource: "(липсващ ресурс)"
+        update:
+          error: Възникна проблем при обновяването на този шаблон.
+          success: Шаблонът е обновен успешно.
+      titles:
+        template_types:
+          questionnaires: Шаблони за въпросници
+        templates: Шаблони
+    models:
+      questionnaire_template:
+        fields:
+          questions: Брой въпроси
+          title: Заглавие на въпросник
+      template:
+        fields:
+          created_at: Създаден на
+        name: Шаблон
+    templates:
+      admin:
+        block_user_templates:
+          edit:
+            title: Редактиране на шаблон за блокиране на потребителско съобщение
+          form:
+            save: Запази
+          index:
+            confirm_delete: Сигурни ли сте, че желаете да изтриете този шаблон?
+            title: Блокиране на потребителски съобщения
+          new:
+            title: Нов шаблон за блокиране на потребителско съобщение
+          template_chooser:
+            select_template: Изберете шаблонен отговор
+        proposal_answer_templates:
+          edit:
+            title: Редактиране на шаблон за отговор на предложение
+          form:
+            component_constraint_help: Обърнете внимание, че ще бъдат изброени само пространства за участие, които имат компоненти от типа „предложения“.
+            hint1_html: "<strong>%{organization}</strong> ще бъде заменено от името на организацията"
+            hint2_html: "<strong>%{name}</strong> ще бъде заменено с името на автора"
+            hint3_html: "<strong>%{admin}</strong> ще бъде заменено от името на администратора (този, който отговаря на предложението)"
+            hint_html: "<strong>Съвет:</strong> Можете да използвате тези променливи навсякъде в шаблонния отговор, които ще бъдат заменени при използване на шаблона"
+            save: Запази
+          index:
+            component_constraint: Добавяне на ограничение
+            confirm_delete: Сигурни ли сте, че желаете да изтриете този шаблон?
+            global_scope: Глобално (достъпно навсякъде)
+            internal_state: Вътрешно състояние
+            title: Отговори на предложенията
+          new:
+            title: Нов шаблон за отговор на предложение
+          template_chooser:
+            select_template: Изберете шаблонен отговор
+        questionnaire_templates:
+          choose:
+            create_from_template: Създайте от шаблон
+            description: На път сте да създадете нов въпросник. Можете да изберете предварително дефиниран шаблон и да го промените след това.
+            label: Избор на шаблон
+            placeholder: Избор на шаблон
+            skip_template: Пропусни
+          edit:
+            edit: Редактирай
+            empty: Все още няма въпроси.
+            questionnaire: Въпросник
+            title: Редактиране на шаблон на въпросник
+          form:
+            title: Шаблон за въпросник %{questionnaire_for}
+          index:
+            confirm_delete: Сигурни ли сте, че желаете да изтриете този шаблон?
+            title: Шаблони за въпросници
+          new:
+            title: Нов шаблон за въпросник
+          preview:
+            current_step: Стъпка %{step}
+            of_total_steps: от %{total_steps}
+            tos_agreement: С участието си приемате Условията на услугата
+      admin_log:
+        template:
+          create: "%{user_name} създаде шаблона на въпросника %{resource_name}"
+          delete: "%{user_name} изтри шаблона на въпросника %{resource_name}"
+          duplicate: "%{user_name} дублира шаблона на въпросника %{resource_name}"
+          update: "%{user_name} актуализира шаблона на въпросника %{resource_name}"
+      template_types:
+        block_user: Блокиране на потребителски съобщения
+        proposal_answer_templates: Отговори на предложенията
+        questionnaires: Въпросници

data/config/locales/ca.yml

@@ -10,7 +10,6 @@ ca:
   decidim:
     admin:
       menu:
-        manage: Gestionar
         templates: Plantilles
       templates:
         actions:
@@ -27,6 +26,8 @@ ca:
         destroy:
           success: La plantilla s'ha eliminat correctament.
         empty: Encara no hi ha plantilles.
+        fetch:
+          error: No s'ha pogut trobar aquesta plantilla. Si us plau, torna a carregar la pàgina.
         missing_resource: "(recurs absent)"
         update:
           error: S'ha produït un error en actualitzar aquesta plantilla.

data/config/locales/cs.yml

@@ -10,7 +10,6 @@ cs:
   decidim:
     admin:
       menu:
-        manage: Spravovat
         templates: Šablony
       templates:
         actions:
@@ -27,6 +26,8 @@ cs:
         destroy:
           success: Šablona byla úspěšně odstraněna.
         empty: Zatím nejsou žádné šablony.
+        fetch:
+          error: Nelze najít tuto šablonu. Prosím obnovte stránku.
         missing_resource: "(chybějící zdroj)"
         update:
           error: Při aktualizaci této šablony došlo k chybě.

data/config/locales/de.yml

@@ -10,7 +10,6 @@ de:
   decidim:
     admin:
       menu:
-        manage: Verwalten
         templates: Vorlagen
       templates:
         actions:
@@ -27,6 +26,8 @@ de:
         destroy:
           success: Vorlage erfolgreich gelöscht.
         empty: Es gibt noch keine Vorlagen.
+        fetch:
+          error: Diese Vorlage konnte nicht gefunden werden. Bitte Seite neu laden.
         missing_resource: "(fehlende Ressource)"
         update:
           error: Bei der Aktualisierung dieser Vorlage ist ein Problem aufgetreten.

data/config/locales/en.yml

@@ -10,7 +10,6 @@ en:
   decidim:
     admin:
       menu:
-        manage: Manage
         templates: Templates
       templates:
         actions:
@@ -27,6 +26,8 @@ en:
         destroy:
           success: Template deleted successfully.
         empty: There are no templates yet.
+        fetch:
+          error: Could not find this template. Please reload the page.
         missing_resource: "(missing resource)"
         update:
           error: There was a problem updating this template.

data/config/locales/es-MX.yml

@@ -10,7 +10,6 @@ es-MX:
   decidim:
     admin:
       menu:
-        manage: Gestionar
         templates: Plantillas
       templates:
         actions:
@@ -27,6 +26,8 @@ es-MX:
         destroy:
           success: Plantilla eliminada correctamente.
         empty: Todavía no hay plantillas.
+        fetch:
+          error: No se ha podido encontrar esta plantilla. Por favor, vuelve a cargar la página.
         missing_resource: "(recurso ausente)"
         update:
           error: Se ha producido un error al actualizar esta plantilla.

data/config/locales/es-PY.yml

@@ -10,7 +10,6 @@ es-PY:
   decidim:
     admin:
       menu:
-        manage: Gestionar
         templates: Plantillas
       templates:
         actions:
@@ -27,6 +26,8 @@ es-PY:
         destroy:
           success: Plantilla eliminada correctamente.
         empty: Todavía no hay plantillas.
+        fetch:
+          error: No se ha podido encontrar esta plantilla. Por favor, vuelve a cargar la página.
         missing_resource: "(recurso ausente)"
         update:
           error: Se ha producido un error al actualizar esta plantilla.

data/config/locales/es.yml

@@ -10,7 +10,6 @@ es:
   decidim:
     admin:
       menu:
-        manage: Gestionar
         templates: Plantillas
       templates:
         actions:
@@ -27,6 +26,8 @@ es:
         destroy:
           success: Plantilla eliminada correctamente.
         empty: Todavía no hay plantillas.
+        fetch:
+          error: No se ha podido encontrar esta plantilla. Por favor, vuelve a cargar la página.
         missing_resource: "(recurso ausente)"
         update:
           error: Se ha producido un error al actualizar esta plantilla.

data/config/locales/eu.yml

@@ -10,7 +10,6 @@ eu:
   decidim:
     admin:
       menu:
-        manage: Kudeatu
         templates: Txantiloiak
       templates:
         actions:

data/config/locales/fi-plain.yml

@@ -10,7 +10,6 @@ fi-pl:
   decidim:
     admin:
       menu:
-        manage: Hallinnoi
         templates: Mallipohjat
       templates:
         actions:

data/config/locales/fi.yml

@@ -10,7 +10,6 @@ fi:
   decidim:
     admin:
       menu:
-        manage: Hallinnoi
         templates: Mallipohjat
       templates:
         actions:

data/config/locales/fr-CA.yml

@@ -10,7 +10,6 @@ fr-CA:
   decidim:
     admin:
       menu:
-        manage: Gérer
         templates: Modèles 
       templates:
         actions:
@@ -27,6 +26,7 @@ fr-CA:
         destroy:
           success: Modèle supprimé avec succès.
         empty: Il n'y a pas de modèle pour l'instant.
+        missing_resource: "(ressource manquante)"
         update:
           error: Un problème est survenu lors de la mise à jour de ce modèle.
           success: Modèle mis à jour avec succès.
@@ -58,8 +58,21 @@ fr-CA:
           template_chooser:
             select_template: Sélectionnez un modèle de réponse
         proposal_answer_templates:
+          edit:
+            title: Modifier le modèle de réponse à la proposition
           form:
+            component_constraint_help: Notez que seuls les espaces participatifs ayant des fonctionnalités de type "propositions" seront listés.
+            hint1_html: "<strong>%{organization}</strong> sera remplacé par le nom de l'organisation"
+            hint2_html: "<strong>%{name}</strong> sera remplacé par le nom de l'auteur"
+            hint3_html: "<strong>%{admin}</strong> sera remplacé par le nom de l'administrateur (celui qui répond à la proposition)"
+            hint_html: "<strong>Conseil :</strong> Vous pouvez utilisez ces variables n'importe où dans le modèle de réponse, elles seront remplacées par leur valeur lors de l'utilisation du modèle"
             save: Sauvegarder
+          index:
+            component_constraint: Ajouter une contrainte
+            confirm_delete: Êtes-vous sûr de vouloir supprimer ce modèle ?
+            global_scope: Global (disponible partout)
+            internal_state: Etat interne
+            title: Réponses à la proposition
           new:
             title: Nouveau modèle de réponse à proposition
           template_chooser:

data/config/locales/fr.yml

@@ -10,7 +10,6 @@ fr:
   decidim:
     admin:
       menu:
-        manage: Gérer
         templates: Modèles de questionnaire
       templates:
         actions:
@@ -62,17 +61,17 @@ fr:
           edit:
             title: Modifier le modèle de réponse à la proposition
           form:
-            component_constraint_help: Notez que seuls les espaces participatifs ayant des composantes de type "propositions" seront listés.
+            component_constraint_help: Notez que seuls les espaces participatifs ayant des fonctionnalités de type "propositions" seront listés.
             hint1_html: "<strong>%{organization}</strong> sera remplacé par le nom de l'organisation"
             hint2_html: "<strong>%{name}</strong> sera remplacé par le nom de l'auteur"
             hint3_html: "<strong>%{admin}</strong> sera remplacé par le nom de l'administrateur (celui qui répond à la proposition)"
-            hint_html: "<strong>Conseil:</strong> Vous pouvez utilisez ces variables n'importe où sur le modèle de réponse qui seront remplacés lors de l'utilisation du modèle"
+            hint_html: "<strong>Conseil :</strong> Vous pouvez utilisez ces variables n'importe où dans le modèle de réponse, elles seront remplacées par leur valeur lors de l'utilisation du modèle"
             save: Sauvegarder
           index:
             component_constraint: Ajouter une contrainte
             confirm_delete: Êtes-vous sûr de vouloir supprimer ce modèle ?
             global_scope: Global (disponible partout)
-            internal_state: État interne
+            internal_state: Etat interne
             title: Réponses à la proposition
           new:
             title: Nouveau modèle de réponse à proposition

data/config/locales/he-IL.yml

@@ -0,0 +1 @@
+he: