decidim-templates 0.29.6 → 0.30.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d895182c73134e28ac6ec161fce8273ab0ce4fb9d9a07a44de19c41064e06988
-  data.tar.gz: 71755bde53fceca7e0bb8737179a846fad7de542318eb3102bcde3581c50a501
+  metadata.gz: e0655688c84339a0f4c0adf43bef1bb6785a9366f48a67f3206fee3351c657ae
+  data.tar.gz: 2f92a751ce2dba22c18eb4cdb6efb0fda2ebfe50ba24c99856e806016635be74
 SHA512:
-  metadata.gz: b340af536d2372d99653d83383de5562417341bd4567496b593e148eafe9614569f68d3bfdb13ef188d7481816824c009c6f7d59ea5794a5aba9cac9f3340a62
-  data.tar.gz: 18caf360fcc22fc0173fda732ffee8ab6f606492fe57cb1c176fe9928d840b33a43851b39309c2aad6e4a03e71a1ac2bcc4e57872272175ae2f5419d42a3ce5a
+  metadata.gz: 5c7cf48c8c06dc31b22768e5400968490ec87d291060ff5e3ce0c4de60e5125cf80b0e83a92c06775a1c0c0c5b8ec3d44741086ce35b250087f6f4b11b31c7a0
+  data.tar.gz: 4517073b87a6609eac70df09e98064ce86afd95f6a2df2cbb082e26ac559e42c0346dafda10d7e5ec87280069a054ae00ebeaaca46cda0adbf9ff6d7dc994c5a

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

@@ -6,6 +6,7 @@ module Decidim
       class ProposalAnswerTemplatesController < Decidim::Templates::Admin::ApplicationController
         include Decidim::TranslatableAttributes
         include Decidim::Paginable
+        include Decidim::Proposals::Admin::NeedsInterpolations
 
         helper_method :availability_option_as_text, :availability_options_for_select, :available_states, :proposal_state
 
@@ -63,7 +64,7 @@ module Decidim
 
           response_object = {
             state: state&.token,
-            template: populate_template_interpolations(proposal)
+            template: populate_interpolations(template.description, proposal)
           }
 
           respond_to do |format|
@@ -138,20 +139,6 @@ module Decidim
           Decidim::Proposals::ProposalState.where(decidim_component_id: component_id)
         end
 
-        def populate_template_interpolations(proposal)
-          template.description.to_h do |language, value|
-            value.gsub!("%{organization}", translated_attribute(proposal.organization.name))
-            value.gsub!("%{name}", author_name(proposal))
-            value.gsub!("%{admin}", current_user.name)
-
-            [language, value]
-          end
-        end
-
-        def author_name(proposal)
-          proposal.creator_author.try(:title) || proposal.creator_author.try(:name)
-        end
-
         def proposal
           @proposal ||= Decidim::Proposals::Proposal.find(params[:proposalId])
         end

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

@@ -7,8 +7,10 @@ module Decidim
       #
       class QuestionnaireTemplatesController < Decidim::Templates::Admin::ApplicationController
         include Decidim::TranslatableAttributes
+        include Decidim::Forms::Admin::Concerns::HasQuestionnaire
+        helper Decidim::Forms::Admin::ApplicationHelper
 
-        helper_method :template
+        helper_method :template, :questionnaire
 
         add_breadcrumb_item_from_menu :admin_template_types_menu
 
@@ -135,8 +137,24 @@ module Decidim
           redirect_to URI.parse(params[:url]).path
         end
 
+        def edit_questions_template
+          "decidim/templates/admin/questionnaire_templates/edit_questions"
+        end
+
+        def after_update_url
+          edit_questionnaire_template_path(template)
+        end
+
         private
 
+        def questionnaire
+          template.templatable
+        end
+
+        def i18n_flashes_scope
+          "decidim.forms.admin.questionnaires"
+        end
+
         def collection
           @collection ||= current_organization.templates.where(templatable_type: "Decidim::Forms::Questionnaire")
         end

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

@@ -17,8 +17,10 @@
 
     <div class="card mt-4">
       <div class="card-divider">
-        <h2 class="card-title"><%= t(".questionnaire") %>
+        <h2 class="font-semibold text-secondary block sm:flex items-center justify-between gap-4 w-full first:[&>div]:ml-0 first:[&>*]:ml-auto">
+          <%= t(".questionnaire") %>
           <%= link_to t(".edit"), edit_questionnaire_path(template), class: "button button__sm button__secondary" %>
+          <%= link_to t(".manage_questions"), edit_questions_questionnaire_template_path(template), class: "button button__sm button__secondary" %>
         </h2>
       </div>
 

data/app/views/decidim/templates/admin/questionnaire_templates/edit_questions.erb

@@ -0,0 +1,27 @@
+<% add_decidim_page_title(t("decidim.forms.admin.questionnaires.edit.title")) %>
+
+<div class="questionnaire-questions">
+  <div class="item_show__header">
+    <h1 class="item_show__header-title">
+      <%= t("decidim.forms.admin.questionnaires.edit_questions.title") %>
+        <% if questionnaire.questions_editable? %>
+          <button class="button button__sm button__secondary add-question"><%= t(".add_question") %></button>
+          <button class="button button__sm button__secondary add-separator"><%= t(".add_separator") %></button>
+          <button class="button button__sm button__secondary add-title-and-description"><%= t(".add_title_and_description") %></button>
+        <% end %>
+    </h1>
+  </div>
+</div>
+
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@form, url: update_questions_questionnaire_template_path(template), method: :patch, html: { class: "form-defaults form edit_questions_survey" }) do |form| %>
+      <%= render partial: "decidim/forms/admin/questionnaires/questions_form", object: form %>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= form.submit t("save", scope: "decidim.forms.admin.questionnaires.edit"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>

data/config/locales/ca.yml

@@ -89,8 +89,13 @@ ca:
           edit:
             edit: Editar
             empty: Encara no hi ha preguntes.
+            manage_questions: Gestionar les preguntes
             questionnaire: Qüestionari
             title: Editar la plantilla del qüestionari
+          edit_questions:
+            add_question: Afegeix una pregunta
+            add_separator: Afegir un separador
+            add_title_and_description: Afegir títol i descripció
           form:
             title: Plantilla del qüestionari %{questionnaire_for}
           index:

data/config/locales/cs.yml

@@ -89,8 +89,13 @@ cs:
           edit:
             edit: Upravit
             empty: Zatím nejsou žádné otázky.
+            manage_questions: Spravovat otázky
             questionnaire: Dotazník
             title: Upravit šablonu dotazníku
+          edit_questions:
+            add_question: Přidat otázku
+            add_separator: Přidat oddělovač
+            add_title_and_description: Přidat název a popis
           form:
             title: Šablona dotazníku %{questionnaire_for}
           index:

data/config/locales/de.yml

@@ -82,15 +82,20 @@ de:
         questionnaire_templates:
           choose:
             create_from_template: Aus Vorlage erstellen
-            description: Sie erstellen in Kürze einen neuen Fragebogen. Hier können Sie eine vordefinierte Vorlage auswählen und anschließend anpassen.
+            description: Sie sind im Begriff, einen neuen Fragebogen zu erstellen. Sie können eine vordefinierte Vorlage auswählen und sie anschließend ändern.
             label: Vorlage auswählen
             placeholder: Vorlage auswählen
             skip_template: Überspringen
           edit:
             edit: Bearbeiten
             empty: Es gibt noch keine Fragen.
+            manage_questions: Fragen verwalten
             questionnaire: Fragebogen
             title: Formular-Vorlage bearbeiten
+          edit_questions:
+            add_question: Frage hinzufügen
+            add_separator: Trennzeichen hinzufügen
+            add_title_and_description: Titel und Beschreibung hinzufügen
           form:
             title: Fragebogenvorlage %{questionnaire_for}
           index:

data/config/locales/en.yml

@@ -89,8 +89,13 @@ en:
           edit:
             edit: Edit
             empty: There are no questions yet.
+            manage_questions: Manage questions
             questionnaire: Questionnaire
             title: Edit questionnaire template
+          edit_questions:
+            add_question: Add question
+            add_separator: Add separator
+            add_title_and_description: Add title and description
           form:
             title: Questionnaire template %{questionnaire_for}
           index:

data/config/locales/es-MX.yml

@@ -63,7 +63,7 @@ es-MX:
           edit:
             title: Editar la plantilla de respuesta a la propuesta
           form:
-            component_constraint_help: Ten en cuenta que solo se listarán los espacios de participación que tengan componentes del tipo "propuestas".
+            component_constraint_help: Tenga en cuenta que solo se listarán los espacios de participación que tengan componentes del tipo "propuestas".
             hint1_html: "<strong>%{organization}</strong> será reemplazado por el nombre de la organización"
             hint2_html: "<strong>%{name}</strong> será reemplazado por el nombre de la autora"
             hint3_html: "<strong>%{admin}</strong> será reemplazado por el nombre de la administradora (la que responde a la propuesta)"
@@ -76,7 +76,7 @@ es-MX:
             proposal_state_id: Estado interno
             title: Respuestas a propuestas
           new:
-            title: Nueva plantilla de respuesta a propuesta
+            title: Nueva la plantilla de respuesta a propuesta
           template_chooser:
             select_template: Selecciona una plantilla de respuesta
         questionnaire_templates:
@@ -89,8 +89,13 @@ es-MX:
           edit:
             edit: Editar
             empty: Aún no hay preguntas.
+            manage_questions: Gestionar las preguntas
             questionnaire: Cuestionario
             title: Editar plantilla del cuestionario
+          edit_questions:
+            add_question: Añadir una pregunta
+            add_separator: Añadir un separador
+            add_title_and_description: Añadir título y descripción
           form:
             title: Plantilla de cuestionario %{questionnaire_for}
           index:

data/config/locales/es-PY.yml

@@ -63,7 +63,7 @@ es-PY:
           edit:
             title: Editar la plantilla de respuesta a la propuesta
           form:
-            component_constraint_help: Ten en cuenta que solo se listarán los espacios de participación que tengan componentes del tipo "propuestas".
+            component_constraint_help: Tenga en cuenta que solo se listarán los espacios de participación que tengan componentes del tipo "propuestas".
             hint1_html: "<strong>%{organization}</strong> será reemplazado por el nombre de la organización"
             hint2_html: "<strong>%{name}</strong> será reemplazado por el nombre de la autora"
             hint3_html: "<strong>%{admin}</strong> será reemplazado por el nombre de la administradora (la que responde a la propuesta)"
@@ -76,7 +76,7 @@ es-PY:
             proposal_state_id: Estado interno
             title: Respuestas a propuestas
           new:
-            title: Nueva plantilla de respuesta a propuesta
+            title: Nueva la plantilla de respuesta a propuesta
           template_chooser:
             select_template: Selecciona una plantilla de respuesta
         questionnaire_templates:
@@ -89,8 +89,13 @@ es-PY:
           edit:
             edit: Editar
             empty: Aún no hay preguntas.
+            manage_questions: Gestionar las preguntas
             questionnaire: Cuestionario
             title: Editar plantilla del cuestionario
+          edit_questions:
+            add_question: Añadir una pregunta
+            add_separator: Añadir un separador
+            add_title_and_description: Añadir título y descripción
           form:
             title: Plantilla de cuestionario %{questionnaire_for}
           index:

data/config/locales/es.yml

@@ -63,7 +63,7 @@ es:
           edit:
             title: Editar la plantilla de respuesta a la propuesta
           form:
-            component_constraint_help: Ten en cuenta que solo se listarán los espacios de participación que tengan componentes del tipo "propuestas".
+            component_constraint_help: Tenga en cuenta que solo se listarán los espacios de participación que tengan componentes del tipo "propuestas".
             hint1_html: "<strong>%{organization}</strong> será reemplazado por el nombre de la organización"
             hint2_html: "<strong>%{name}</strong> será reemplazado por el nombre de la autora"
             hint3_html: "<strong>%{admin}</strong> será reemplazado por el nombre de la administradora (la que responde a la propuesta)"
@@ -76,7 +76,7 @@ es:
             proposal_state_id: Estado interno
             title: Respuestas a propuestas
           new:
-            title: Nueva plantilla de respuesta a propuesta
+            title: Nueva la plantilla de respuesta a propuesta
           template_chooser:
             select_template: Selecciona una plantilla de respuesta
         questionnaire_templates:
@@ -89,8 +89,13 @@ es:
           edit:
             edit: Editar
             empty: Aún no hay preguntas.
+            manage_questions: Gestionar las preguntas
             questionnaire: Cuestionario
             title: Editar plantilla del cuestionario
+          edit_questions:
+            add_question: Añadir una pregunta
+            add_separator: Añadir un separador
+            add_title_and_description: Añadir título y descripción
           form:
             title: Plantilla de cuestionario %{questionnaire_for}
           index:

data/config/locales/eu.yml

@@ -89,8 +89,13 @@ eu:
           edit:
             edit: Editatu
             empty: Oraindik ez dago galderarik.
+            manage_questions: Kudeatu galderak
             questionnaire: Galdetegia
-            title: Galdetegiaren txantiloia editatu
+            title: Editatu galdetegiaren txantiloia
+          edit_questions:
+            add_question: Gehitu galdera
+            add_separator: Gehitu banatzailea
+            add_title_and_description: Gehitu izenburua eta deskribapena
           form:
             title: '%{questionnaire_for}% galdetegiaren txantiloia'
           index:

data/config/locales/fi-plain.yml

@@ -89,15 +89,20 @@ fi-pl:
           edit:
             edit: Muokkaa
             empty: Kysymyksiä ei ole vielä.
+            manage_questions: Hallinnoi kysymyksiä
             questionnaire: Kysely
-            title: Muokkaa kyselyn mallipohjaa
+            title: Muokkaa kyselylomakkeen mallipohjaa
+          edit_questions:
+            add_question: Lisää kysymys
+            add_separator: Lisää erotinviiva
+            add_title_and_description: Lisää otsikko ja kuvaus
           form:
             title: Kyselylomakemalli %{questionnaire_for}
           index:
             confirm_delete: Haluatko varmasti poistaa tämän mallipohjan?
             title: Kyselymallit
           new:
-            title: Uusi kyselyn mallipohja
+            title: Uusi kyselylomakkeen mallipohja
           preview:
             current_step: Vaihe %{step}
             of_total_steps: / %{total_steps}

data/config/locales/fi.yml

@@ -34,7 +34,7 @@ fi:
           success: Mallipohjan päivitys onnistui.
       titles:
         template_types:
-          questionnaires: Kyselyjen mallipohjat
+          questionnaires: Kyselymallit
         templates: Mallipohjat
     models:
       questionnaire_template:
@@ -89,25 +89,30 @@ fi:
           edit:
             edit: Muokkaa
             empty: Kysymyksiä ei ole vielä.
+            manage_questions: Hallinnoi kysymyksiä
             questionnaire: Kysely
-            title: Muokkaa kyselyn mallipohjaa
+            title: Muokkaa kyselylomakkeen mallipohjaa
+          edit_questions:
+            add_question: Lisää kysymys
+            add_separator: Lisää erotinviiva
+            add_title_and_description: Lisää otsikko ja kuvaus
           form:
-            title: Kyselyn mallipohja %{questionnaire_for}
+            title: Kyselylomakemalli %{questionnaire_for}
           index:
             confirm_delete: Haluatko varmasti poistaa tämän mallipohjan?
-            title: Kyselyjen mallipohjat
+            title: Kyselymallit
           new:
-            title: Uusi kyselyn mallipohja
+            title: Uusi kyselylomakkeen mallipohja
           preview:
             current_step: Vaihe %{step}
             of_total_steps: / %{total_steps}
             tos_agreement: Osallistumalla hyväksyt käyttöehdot
       admin_log:
         template:
-          create: "%{user_name} loi kyselyn mallipohjan %{resource_name}"
-          delete: "%{user_name} poisti kyselyn mallipohjan %{resource_name}"
-          duplicate: "%{user_name} kopioi kyselyn mallipohjan %{resource_name}"
-          update: "%{user_name} päivitti kyselyn mallipohjaa %{resource_name}"
+          create: "%{user_name} loi kyselymallin %{resource_name}"
+          delete: "%{user_name} poisti kyselymallin %{resource_name}"
+          duplicate: "%{user_name} kopioi kyselymallin %{resource_name}"
+          update: "%{user_name} päivitti kyselymallia %{resource_name}"
       template_types:
         block_user: Käyttäjien eston viestit
         proposal_answer_templates: Ehdotusten vastaukset

data/config/locales/fr-CA.yml

@@ -89,8 +89,13 @@ fr-CA:
           edit:
             edit: Modifier
             empty: Il n'y a pas encore de question.
+            manage_questions: Gérer les questions
             questionnaire: Questionnaire
             title: Modifier le modèle de questionnaire
+          edit_questions:
+            add_question: Ajouter une question
+            add_separator: Ajouter un séparateur
+            add_title_and_description: Ajouter un titre et une description
           form:
             title: Modèle de questionnaire %{questionnaire_for}
           index:

data/config/locales/fr.yml

@@ -89,8 +89,13 @@ fr:
           edit:
             edit: Modifier
             empty: Il n'y a pas encore de question.
+            manage_questions: Gérer les questions
             questionnaire: Questionnaire
             title: Modifier le modèle de questionnaire
+          edit_questions:
+            add_question: Ajouter une question
+            add_separator: Ajouter un séparateur
+            add_title_and_description: Ajouter un titre et une description
           form:
             title: Modèle de questionnaire %{questionnaire_for}
           index:

data/config/locales/ja.yml

@@ -89,8 +89,13 @@ ja:
           edit:
             edit: 編集
             empty: 質問はまだありません。
+            manage_questions: 質問の管理
             questionnaire: アンケート
             title: アンケートテンプレートの編集
+          edit_questions:
+            add_question: 質問の追加
+            add_separator: 区切り文字を追加
+            add_title_and_description: タイトルと説明を追加
           form:
             title: アンケートテンプレート %{questionnaire_for}
           index:

data/config/locales/ro-RO.yml

@@ -12,29 +12,24 @@ ro:
       menu:
         templates: Șabloane
       templates:
-        actions:
-          new_template: Șablon nou
         apply:
           error: A apărut o eroare la aplicarea acestui șablon.
           success: Șablonul a fost aplicat cu succes.
         copy:
-          error: A apărut o eroare la copierea acestui șablon.
+          error: A apărut o eroare la copierea acestui model.
           success: Șablonul a fost copiat cu succes.
         create:
-          error: A apărut o eroare la crearea acestui șablon.
+          error: A apărut o eroare la crearea acestui model.
           success: Șablonul a fost creat cu succes.
         destroy:
           success: Șablonul a fost șters cu succes.
-        empty: Nu există încă nici un șablon.
-        fetch:
-          error: Nu am putut găsi acest șablon. Vă rugăm să reîncărcați pagina.
-        missing_resource: "(resursă lipsă)"
+        empty: Nu există încă nici un model.
         update:
           error: A apărut o eroare la actualizarea acestui șablon.
-          success: Șablonul a fost actualizat cu succes.
+          success: Șablonul a fost importat cu succes.
       titles:
         template_types:
-          questionnaires: Șabloane chestionar
+          questionnaires: Şabloane chestionar
         templates: Şabloane
     models:
       questionnaire_template:
@@ -44,71 +39,46 @@ ro:
       template:
         fields:
           created_at: Creat la
-        name: Șablon
+        name: Model
     templates:
       admin:
         block_user_templates:
-          edit:
-            title: Modificați șablonul pentru mesajele către participanții blocați
           form:
             save: Salvează
           index:
             confirm_delete: Sunteți sigur că doriți să ștergeți acest șablon?
-            title: Mesaje către participanții blocați
-          new:
-            title: Adaugați șablon nou cu mesajul către participanții blocați
+            title: Blochează mesajele utilizatorilor
           template_chooser:
-            select_template: Selectați un șablon de răspuns
+            select_template: Selectați un răspuns șablon
         proposal_answer_templates:
-          edit:
-            title: Modificați șablon de răspuns pentru propuneri
           form:
-            component_constraint_help: Trebuie remarcat faptul că vor fi enumerate numai spațiile participative care conțin componente de tipul „propuneri”.
-            hint1_html: "<strong>%{organization}</strong> va fi înlocuit cu numele organizației"
-            hint2_html: "<strong>%{name}</strong> va fi înlocuit cu numele autorului"
-            hint3_html: "<strong>%{admin}</strong> va fi înlocuit cu numele administratorului (cel care răspunde propunerii)"
-            hint_html: "<strong>Sugestie:</strong> Puteți utiliza aceste variabile oriunde în șablonul de răspuns care va fi înlocuit atunci când utilizați șablonul"
             save: Salvează
-          index:
-            component_constraint: Adaugați o constrângere
-            confirm_delete: Sunteți sigur că doriți să ștergeți acest șablon?
-            missing_state: Stare lipsă
-            proposal_state_id: Stare internă
-            title: Răspunsuri pentru propuneri
-          new:
-            title: Modificați șablon de răspuns pentru propuneri
-          template_chooser:
-            select_template: Selectați șablon de răspuns pentru propuneri
         questionnaire_templates:
           choose:
             create_from_template: Creează după model
             description: Ești pe cale de a crea un nou chestionar. Poți alege un model predefinit și să-l modifici ulterior.
-            label: Alegeți un șablon
-            placeholder: Alegeți un șablon
+            label: Alege un model
+            placeholder: Alege un model
             skip_template: Treci peste
           edit:
-            edit: Modificați
-            empty: Nu există întrebări încă.
+            edit: Editează
+            empty: Nu există încă întrebări.
             questionnaire: Chestionar
-            title: Modificați șablonul chestionar
           form:
-            title: Sablon chestionar %{questionnaire_for}
+            title: Model de chestionar %{questionnaire_for}
           index:
-            confirm_delete: Sunteți sigur că doriți să ștergeți acest șablon?
-            title: Şabloane chestionar
-          new:
-            title: Șablon nou de chestionar
+            confirm_delete: Sigur dorești să ștergi acest model?
+            title: Model de chestionar
           preview:
             current_step: Pasul %{step}
             of_total_steps: din %{total_steps}
-            tos_agreement: Prin participare acceptați termenii și condițiile de utilizare ale platformei
+            tos_agreement: Prin participare accepți Termenii și condițiile sale de utilizare
       admin_log:
         template:
           create: "%{user_name} a creat șablonul chestionarului %{resource_name}"
           delete: "%{user_name} a șters șablonul chestionarului %{resource_name}"
-          duplicate: "%{user_name} a copiat șablonul chestionarului %{resource_name}"
+          duplicate: "%{user_name} a duplicat șablonul chestionarului %{resource_name}"
           update: "%{user_name} a actualizat șablonul chestionarului %{resource_name}"
       template_types:
-        block_user: Mesaje către participanții blocați
-        proposal_answer_templates: Răspunsuri pentru propuneri
+        block_user: Blochează mesajele utilizatorilor
         questionnaires: Chestionare

data/config/locales/sv.yml

@@ -101,7 +101,7 @@ sv:
           preview:
             current_step: Steg %{step}
             of_total_steps: av %{total_steps}
-            tos_agreement: Genom att fortsätta godkänner du villkoren för anmälan
+            tos_agreement: Genom att delta godkänner du användarvillkoren
       admin_log:
         template:
           create: "%{user_name} skapade enkätmallen %{resource_name}"

data/db/seeds.rb

@@ -62,11 +62,12 @@ if !Rails.env.production? || ENV.fetch("SEED", nil)
     )
   end
 
-  %w(matrix_single matrix_multiple).each do |matrix_question_type|
+  %w(matrix_single matrix_multiple).each_with_index do |matrix_question_type, index|
     question = Decidim::Forms::Question.create!(
       questionnaire:,
       body: Decidim::Faker::Localized.paragraph,
-      question_type: matrix_question_type
+      question_type: matrix_question_type,
+      position: index + 4
     )
 
     3.times do |idx|

data/decidim-templates.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
     "homepage_uri" => "https://decidim.org",
     "source_code_uri" => "https://github.com/decidim/decidim"
   }
-  s.required_ruby_version = "~> 3.2.0"
+  s.required_ruby_version = "~> 3.3.0"
 
   s.name = "decidim-templates"
   s.summary = "A decidim templates module"

data/lib/decidim/templates/admin_engine.rb

@@ -12,41 +12,51 @@ module Decidim
       paths["lib/tasks"] = nil
 
       routes do
-        resources :proposal_answer_templates do
-          member do
-            post :copy
+        constraints(->(request) { Decidim::Admin::OrganizationDashboardConstraint.new(request).matches? }) do
+          resources :proposal_answer_templates do
+            member do
+              post :copy
+            end
+            collection do
+              get :fetch
+            end
           end
-          collection do
-            get :fetch
-          end
-        end
 
-        ## Routes for Questionnaire Templates
-        resources :questionnaire_templates do
-          member do
-            post :copy
+          ## Routes for Questionnaire Templates
+          resources :questionnaire_templates do
+            member do
+              post :copy
+              get :edit_questions
+              patch :update_questions
+              resource :questionnaire, module: :questionnaire_templates # To manage the templatable resource
+            end
 
-            resource :questionnaire, module: :questionnaire_templates # To manage the templatable resource
+            collection do
+              post :apply # To use when creating an object from a template
+              post :skip # To use when creating an object without a template
+              get :preview # To provide a preview for the template in the object creation view
+            end
           end
 
-          collection do
-            post :apply # To use when creating an object from a template
-            post :skip # To use when creating an object without a template
-            get :preview # To provide a preview for the template in the object creation view
-          end
-        end
-        resources :block_user_templates do
-          member do
-            post :copy
-          end
-          collection do
-            get :fetch
+          resources :block_user_templates do
+            member do
+              post :copy
+            end
+            collection do
+              get :fetch
+            end
           end
-        end
 
-        get "/questionnaire_template/questionnaire/answer_options", to: "questionnaire_templates/questionnaires#answer_options", as: "answer_options_template"
+          get "/questionnaire_template/questionnaire/answer_options", to: "questionnaire_templates/questionnaires#answer_options", as: "answer_options_template"
 
-        root to: "questionnaire_templates#index"
+          root to: "questionnaire_templates#index"
+        end
+      end
+
+      initializer "decidim_templates_admin.mount_routes" do
+        Decidim::Core::Engine.routes do
+          mount Decidim::Templates::AdminEngine, at: "/admin/templates", as: "decidim_admin_templates"
+        end
       end
 
       initializer "decidim_templates_admin.menu" do

data/lib/decidim/templates/engine.rb

@@ -15,10 +15,6 @@ module Decidim
         # root to: "templates#index"
       end
 
-      initializer "decidim_templates.register_icons" do
-        Decidim.icons.register(name: "user-forbid-line", icon: "user-forbid-line", category: "system", description: "", engine: :templates)
-      end
-
       initializer "decidim_templates.webpacker.assets_path" do
         Decidim.register_assets_path File.expand_path("app/packs", root)
       end

data/lib/decidim/templates/test/shared_examples/uses_questionnaire_templates.rb

@@ -46,7 +46,7 @@ shared_examples_for "uses questionnaire templates" do |_questionnaire_for|
             description: {},
             tos: {}
           )
-          visit questionnaire_edit_path
+          click_on "Edit"
         end
 
         it "shows the template choosing screen" do
@@ -87,7 +87,7 @@ shared_examples_for "uses questionnaire templates" do |_questionnaire_for|
         description: {},
         tos: {}
       )
-      visit questionnaire_edit_path
+      click_on "Edit"
 
       select(template.name["en"], from: "select-template")
 
@@ -96,14 +96,13 @@ shared_examples_for "uses questionnaire templates" do |_questionnaire_for|
       end
 
       click_on "Create from template"
+      click_on "Save"
     end
 
     it "copies the template data to the questionnaire on submit" do
-      within "form.edit_questionnaire" do
-        click_on "Expand all"
-        expect(page.find_by_id("questionnaire_title_en").value).to eq(template.templatable.title["en"])
-        expect(page.find("#questionnaire_questions_#{questionnaire_question.id}_body_en").value).to eq(question.body["en"])
-      end
+      click_on "Manage questions"
+      click_on "Expand all"
+      expect(page.find("#questions_questions_#{questionnaire_question.id}_body_en").value).to eq(question.body["en"])
     end
   end
 end

data/lib/decidim/templates/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-templates version.
   module Templates
     def self.version
-      "0.29.6"
+      "0.30.0.rc1"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-templates
 version: !ruby/object:Gem::Version
-  version: 0.29.6
+  version: 0.30.0.rc1
 platform: ruby
 authors:
 - Vera Rojman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-28 00:00:00.000000000 Z
+date: 2025-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -16,98 +16,98 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.6
+        version: 0.30.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.6
+        version: 0.30.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-forms
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.6
+        version: 0.30.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.6
+        version: 0.30.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.6
+        version: 0.30.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.6
+        version: 0.30.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.6
+        version: 0.30.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.6
+        version: 0.30.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.6
+        version: 0.30.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.6
+        version: 0.30.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.6
+        version: 0.30.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.6
+        version: 0.30.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-surveys
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.6
+        version: 0.30.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.6
+        version: 0.30.0.rc1
 description: This module provides a solution to create templates for different Decidim
   models, such as Proposals and Questionnaires..
 email:
@@ -169,6 +169,7 @@ files:
 - app/views/decidim/templates/admin/questionnaire_templates/_form.html.erb
 - app/views/decidim/templates/admin/questionnaire_templates/_preview.html.erb
 - app/views/decidim/templates/admin/questionnaire_templates/edit.html.erb
+- app/views/decidim/templates/admin/questionnaire_templates/edit_questions.erb
 - app/views/decidim/templates/admin/questionnaire_templates/index.html.erb
 - app/views/decidim/templates/admin/questionnaire_templates/new.html.erb
 - app/views/decidim/templates/admin/questionnaire_templates/preview.js.erb
@@ -179,7 +180,6 @@ files:
 - config/locales/bg.yml
 - config/locales/bn-BD.yml
 - config/locales/bs-BA.yml
-- config/locales/ca-IT.yml
 - config/locales/ca.yml
 - config/locales/cs.yml
 - config/locales/da.yml
@@ -274,14 +274,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: 3.2.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: A decidim templates module

data/config/locales/ca-IT.yml

@@ -1,114 +0,0 @@
----
-ca-IT:
-  activemodel:
-    attributes:
-      questionnaire:
-        title: Títol
-      template:
-        description: Descripció
-        name: Nom
-  decidim:
-    admin:
-      menu:
-        templates: Plantilles
-      templates:
-        actions:
-          new_template: Afegir plantilla
-        apply:
-          error: S'ha produït un error en actualitzar aquesta plantilla.
-          success: La plantilla s'ha aplicat correctament.
-        copy:
-          error: S'ha produït un error en copiar aquesta plantilla.
-          success: La plantilla s'ha copiat correctament.
-        create:
-          error: S'ha produït un error en crear aquesta plantilla.
-          success: La plantilla s'ha creat correctament.
-        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.
-          success: La plantilla s'ha actualitzat correctament.
-      titles:
-        template_types:
-          questionnaires: Plantilles de qüestionari
-        templates: Plantilles
-    models:
-      questionnaire_template:
-        fields:
-          questions: Nombre de preguntes
-          title: Títol del qüestionari
-      template:
-        fields:
-          created_at: Creat el
-        name: Plantilla
-    templates:
-      admin:
-        block_user_templates:
-          edit:
-            title: Editar la plantilla del missatge de bloqueig del compte d'usuària
-          form:
-            save: Desar
-          index:
-            confirm_delete: Segur que vols eliminar aquesta plantilla?
-            title: Bloquejar els missatges de la usuària
-          new:
-            title: Nova plantilla del missatge de bloqueig del compte d'usuària
-          template_chooser:
-            select_template: Selecciona una plantilla de resposta
-        proposal_answer_templates:
-          edit:
-            title: Editar la plantilla de resposta a la proposta
-          form:
-            component_constraint_help: Tingues en compte que només es llistaran els espais de participació que tinguin habilitat algun component de "propostes".
-            hint1_html: "<strong>%{organization}</strong> es reemplaçarà pel nom de l'organització"
-            hint2_html: "<strong>%{name}</strong> es reemplaçarà pel nom de l'autora"
-            hint3_html: "<strong>%{admin}</strong> serà reemplaçat pel nom de l'administradora (la que està responent a la proposta)"
-            hint_html: "<strong>Suggeriment:</strong> Pots fer servir aquestes variables a qualsevol lloc a la plantilla de resposta i seran substituïdes pels valors en actiu quan es faci servir la plantilla"
-            save: Desar
-          index:
-            component_constraint: Afegir restricció
-            confirm_delete: Segur que vols eliminar aquesta plantilla?
-            missing_state: Hi manca l'estat
-            proposal_state_id: Estat intern
-            title: Respostes a la proposta
-          new:
-            title: Nova plantilla de resposta a proposta
-          template_chooser:
-            select_template: Selecciona una plantilla de resposta
-        questionnaire_templates:
-          choose:
-            create_from_template: Crear des d'una plantilla
-            description: Estàs a punt de crear un nou qüestionari. Pots triar una plantilla predefinida i modificar-la després.
-            label: Escollir una plantilla
-            placeholder: Escollir una plantilla
-            skip_template: Ometre
-          edit:
-            edit: Editar
-            empty: Encara no hi ha preguntes.
-            questionnaire: Qüestionari
-            title: Editar la plantilla del qüestionari
-          form:
-            title: Plantilla del qüestionari %{questionnaire_for}
-          index:
-            confirm_delete: Segur que vols eliminar aquesta plantilla?
-            title: Plantilles de qüestionari
-          new:
-            title: Nova plantilla de qüestioniari
-          preview:
-            current_step: Pas %{step}
-            of_total_steps: de %{total_steps}
-            tos_agreement: En participar acceptes els Termes i condicions d'ús
-      admin_log:
-        template:
-          create: "%{user_name} ha actualitzat la plantilla del qüestionari %{resource_name}"
-          delete: "%{user_name} ha esborrat la plantilla del qüestionari %{resource_name}"
-          duplicate: "%{user_name} ha duplicat la plantilla del qüestionari %{resource_name}"
-          update: "%{user_name} ha actualitzat la plantilla del qüestionari %{resource_name}"
-      template_types:
-        block_user: Bloquejar els missatges de la usuària
-        proposal_answer_templates: Respostes a propostes
-        questionnaires: Qüestionari