decidim-templates 0.28.3 → 0.29.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1727bbce0e106f37851710a4a3dc0ca2f193d7448837562f029aea4895acea0
-  data.tar.gz: 9633de1b0b95f2b22a385a4d8caa1883c8f670d015e50ea1b7f5aba452f42ee2
+  metadata.gz: c9b72969a1ffc689d6abcd27cc5b6ac070ff31ca0affb0a9b6b9d8c1be14e2b6
+  data.tar.gz: 6f318b04297a61c3e624f5d8490076fe01540a6ce70f86c7cebfc4caa893ae38
 SHA512:
-  metadata.gz: b199d92d0fad9f0716cac37a5aa560ffe208f9e8f079b0c01efce80d626acfab350468359ca1b762fda9018cb6a8aae25ec42f632bbc6f32eb4b8f97a4a9feaa
-  data.tar.gz: 35814562442adeca9a0538d53a6565098133999cd13224f3a7f21d224700458aad5b64fe7c0d54bdf08de31634280a125e80d1613da30e39e7fe595804cd7f2f
+  metadata.gz: 9e41c2209802518d81811990443caa42b50d2257bda5bcfcc7ca1ece831360df0bdd49497096a21cf24a542b1fb9a1f79d3d176460b9de4173b50880faada1e5
+  data.tar.gz: 22d61f04fe3c26f518dbba6883507d2c7ed2f21b881ecc46292face89fc6844f49a4bf841d02c6b747f96e7cdafb02cf6fb75e83ab6960c5b738260f9c6c6b4a

data/app/commands/decidim/templates/admin/create_proposal_answer_template.rb

@@ -12,6 +12,7 @@ module Decidim
         end
 
         def call
+          return broadcast(:component_selected) if @form.select_component
           return broadcast(:invalid) unless @form.valid?
 
           @template = Decidim.traceability.create!(
@@ -20,7 +21,7 @@ module Decidim
             name: @form.name,
             description: @form.description,
             organization: @form.current_organization,
-            field_values: { internal_state: @form.internal_state },
+            field_values: { proposal_state_id: @form.proposal_state_id },
             target: :proposal_answer
           )
 

data/app/commands/decidim/templates/admin/questionnaire_copier.rb

@@ -11,6 +11,12 @@ module Decidim
           original_questionnaire.questions.each do |original_question|
             new_question = original_question.dup
             new_question.questionnaire = new_questionnaire
+            new_question.assign_attributes(
+              answer_options_count: 0,
+              matrix_rows_count: 0,
+              display_conditions_count: 0,
+              display_conditions_for_other_questions_count: 0
+            )
             new_question.save!
             copy_questionnaire_answer_options(original_question, new_question)
             copy_questionnaire_matrix_rows(original_question, new_question)

data/app/commands/decidim/templates/admin/update_proposal_answer_template.rb

@@ -24,7 +24,7 @@ module Decidim
             @user,
             name: @form.name,
             description: @form.description,
-            field_values: { internal_state: @form.internal_state },
+            field_values: { proposal_state_id: @form.proposal_state_id },
             target: :proposal_answer
           )
 
@@ -36,12 +36,9 @@ module Decidim
         private
 
         def identify_templateable_resource
-          resource = @form.current_organization
-          if @form.component_constraint.present?
-            found_component = Decidim::Component.find_by(id: @form.component_constraint, manifest_name: "proposals")
-            if found_component.present?
-              resource = found_component&.participatory_space&.decidim_organization_id == @form.current_organization.id ? found_component : nil
-            end
+          found_component = Decidim::Component.find_by(id: @form.component_constraint, manifest_name: "proposals")
+          if found_component.present?
+            resource = found_component&.participatory_space&.decidim_organization_id == @form.current_organization.id ? found_component : nil
           end
           resource
         end

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

@@ -7,7 +7,7 @@ module Decidim
         include Decidim::TranslatableAttributes
         include Decidim::Paginable
 
-        helper_method :availability_option_as_text, :availability_options_for_select
+        helper_method :availability_option_as_text, :availability_options_for_select, :available_states, :proposal_state
 
         add_breadcrumb_item_from_menu :admin_template_types_menu
 
@@ -32,6 +32,10 @@ module Decidim
               redirect_to proposal_answer_templates_path
             end
 
+            on(:component_selected) do
+              render :new
+            end
+
             on(:invalid) do
               flash.now[:alert] = I18n.t("templates.create.error", scope: "decidim.admin")
               render :new
@@ -55,8 +59,10 @@ module Decidim
 
           return render json: { msg: I18n.t("templates.fetch.error", scope: "decidim.admin") }, status: :unprocessable_entity if template.blank?
 
+          state = fetch_proposal_state(template)
+
           response_object = {
-            state: template.field_values["internal_state"],
+            state: state&.token,
             template: populate_template_interpolations(proposal)
           }
 
@@ -118,9 +124,23 @@ module Decidim
 
         private
 
+        def fetch_proposal_state(template)
+          available_states(template.templatable_id).find_by(id: template.field_values["proposal_state_id"])
+        end
+
+        def proposal_state(template)
+          state = fetch_proposal_state(template)
+
+          state ? translated_attribute(state&.title) : I18n.t("decidim.templates.admin.proposal_answer_templates.index.missing_state")
+        end
+
+        def available_states(component_id = nil)
+          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}", proposal.organization.name)
+            value.gsub!("%{organization}", translated_attribute(proposal.organization.name))
             value.gsub!("%{name}", author_name(proposal))
             value.gsub!("%{admin}", current_user.name)
 
@@ -138,25 +158,22 @@ module Decidim
 
         def availability_option_as_text(template)
           return unless template.templatable_type
-          return t("global_scope", scope: "decidim.templates.admin.proposal_answer_templates.index") if template.templatable == current_organization
 
-          avaliablity_options.select { |a| a.last == template.templatable_id }&.flatten&.first || t("templates.missing_resource", scope: "decidim.admin")
+          availability_options.select { |a| a.last == template.templatable_id }.flatten.first || t("templates.missing_resource", scope: "decidim.admin")
         end
 
         def availability_options_for_select
-          avaliablity_options
+          availability_options
         end
 
-        def avaliablity_options
-          @avaliablity_options = []
-          @avaliablity_options.push [t("global_scope", scope: "decidim.templates.admin.proposal_answer_templates.index"), 0]
-
+        def availability_options
+          @availability_options = []
           Decidim::Component.includes(:participatory_space).where(manifest_name: [:proposals])
                             .select { |a| a.participatory_space.decidim_organization_id == current_organization.id }.each do |component|
-            @avaliablity_options.push [formatted_name(component), component.id]
+            @availability_options.push [formatted_name(component), component.id]
           end
 
-          @avaliablity_options
+          @availability_options
         end
 
         def formatted_name(component)

data/app/forms/decidim/templates/admin/proposal_answer_template_form.rb

@@ -4,18 +4,31 @@ module Decidim
   module Templates
     module Admin
       class ProposalAnswerTemplateForm < TemplateForm
-        attribute :internal_state, String
+        attribute :proposal_state_id, Integer
         attribute :component_constraint, Integer
+        attribute :select_component, Boolean, default: false
 
-        validates :internal_state, presence: true
+        validate :component_has_been_selected
+        validate :proposal_state_id_is_valid
 
         def map_model(model)
-          self.internal_state = model.field_values["internal_state"]
-          self.component_constraint = if model.templatable_type == "Decidim::Organization"
-                                        0
-                                      else
-                                        model.templatable&.id
-                                      end
+          self.proposal_state_id = model.field_values["proposal_state_id"]&.to_i
+          self.component_constraint = model.templatable&.id
+        end
+
+        def skip_name_validation
+          select_component
+        end
+
+        def proposal_state_id_is_valid
+          if Decidim::Proposals::ProposalState.where(decidim_component_id: component_constraint).find_by(id: proposal_state_id).blank?
+            errors.add(:proposal_state_id,
+                       :blank)
+          end
+        end
+
+        def component_has_been_selected
+          errors.add(:select_component, :blank) if select_component
         end
       end
     end

data/app/forms/decidim/templates/admin/template_form.rb

@@ -10,7 +10,9 @@ module Decidim
         translatable_attribute :name, String
         translatable_attribute :description, String
 
-        validates :name, translatable_presence: true
+        validates :name, translatable_presence: true, unless: :skip_name_validation
+
+        def skip_name_validation = false
       end
     end
   end

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

@@ -1,38 +1,49 @@
 <div class="form__wrapper">
   <div class="card pt-4">
     <div class="card-section">
-      <div class="row column">
-        <%= form.translated :text_field, :name, aria: { label: :name } %>
-      </div>
 
-      <div class="row column">
-        <%= form.translated :editor, :description, rows: 3, aria: { label: :description } %>
-        <%= t(".hint_html") %>
-        <ul>
-          <li><%= t(".hint1_html") %></li>
-          <li><%= t(".hint2_html") %></li>
-          <li><%= t(".hint3_html") %></li>
-        </ul>
-      </div>
+      <% if form.object.component_constraint %>
+        <%= form.hidden_field(:component_constraint, value: form.object.component_constraint) %>
+        <div class="row column">
+          <%= form.translated :text_field, :name, aria: { label: :name } %>
+        </div>
 
-      <div class="row column">
-        <%= form.label :internal_state %>
-        <div class="flex items-center gap-x-4 my-2">
-          <%= form.collection_radio_buttons :internal_state,
-                                            Decidim::Proposals::Proposal::STATES.keys - [:withdrawn],
-                                            :to_s,
-                                            ->(mode) { t(mode, scope: "decidim.proposals.admin.proposal_answers.form") },
-                                            prompt: true do |builder|
-            builder.label { builder.radio_button + builder.text }
-          end %>
+        <div class="row column">
+          <%= form.translated :editor, :description, rows: 3, aria: { label: :description } %>
+          <%= t(".hint_html") %>
+          <ul>
+            <li><%= t(".hint1_html") %></li>
+            <li><%= t(".hint2_html") %></li>
+            <li><%= t(".hint3_html") %></li>
+          </ul>
+        </div>
+        <div class="row column">
+          <%= form.label :proposal_state_id %>
+          <div class="flex items-center gap-x-4 my-2">
+            <%= form.collection_radio_buttons :proposal_state_id,
+                                              available_states( form.object.component_constraint),
+                                              :id,
+                                              lambda { |a|
+                                                translated_attribute(a.title)
+                                              }, prompt: true do |builder|
+              builder.label { builder.radio_button + builder.text } end %>
+          </div>
         </div>
-      </div>
+        <% else %>
 
-      <div class="row column">
-        <%= form.select :component_constraint, availability_options_for_select,
-                        sselected: form.object.component_constraint,
-                        help_text: t(".component_constraint_help") %>
-      </div>
+        <div class="row column">
+          <%= form.select :component_constraint,
+                          availability_options_for_select,
+                          {
+                            selected: form.object.component_constraint,
+                            help_text: t(".component_constraint_help"),
+                            include_blank: true
+                          },
+                          onchange: "this.form.submit()",
+                          disabled: form.object.component_constraint.present? %>
+        </div>
+      <%= form.hidden_field(:select_component, value: true) %>
+      <% end %>
     </div>
   </div>
 </div>

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

@@ -1,7 +1,8 @@
 <% templates = Decidim::Templates::Template.where(
   target: :proposal_answer,
-  templatable: [current_organization, current_component]
+  templatable: current_component
 ).order(:templatable_id) %>
+
 <% if templates.any? %>
   <div class="row column">
     <%= append_javascript_pack_tag "decidim_templates_admin" %>

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

@@ -15,7 +15,7 @@
         <thead>
           <tr>
             <th><%= t("template.name", scope: "decidim.models") %></th>
-            <th><%= t(".internal_state") %></th>
+            <th><%= t(".proposal_state_id") %></th>
             <th><%= t(".component_constraint") %></th>
             <th><%= t("template.fields.created_at", scope: "decidim.models") %></th>
             <th></th>
@@ -25,7 +25,7 @@
           <% @templates.each do |template| %>
             <tr data-proposal_answer-id="<%= template.id %>">
               <td><%= link_to_if allowed_to?(:update, :template, template:) , translated_attribute(template.name), edit_proposal_answer_template_path(template) %></td>
-              <td> <%= t(template.field_values.dig("internal_state"), scope: "decidim.proposals.admin.proposal_answers.form") %></td>
+              <td> <%= proposal_state(template) %></td>
               <td><%= availability_option_as_text(template) %></td>
               <td><%= l template.created_at, format: :long %></td>
 

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

@@ -25,9 +25,9 @@
                               }
           ) { form.hidden_field :questionnaire_template_id } %>
           <div class="card-section questionnaire-template-preview pt-4 hide">
-            <h2 class="item_show__header-title template-name"></h2>
-            <p class="template-description py-4"></p>
-            <div class="row column choose-template-preview"></div>
+            <h2 class="item_show__header-title" data-template-name></h2>
+            <p class="py-4" data-template-description></p>
+            <div class="row column" data-choose-template-preview></div>
           </div>
         </div>
       </div>

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

@@ -2,7 +2,7 @@
 
 <div class="row columns">
   <h3 class="h3"><%= translated_attribute questionnaire.title %></h3>
-  <%= decidim_sanitize translated_attribute questionnaire.description %>
+  <%= decidim_sanitize_translated questionnaire.description %>
 </div>
 
 <div class="row columns">
@@ -15,7 +15,7 @@
         <div class="form__wrapper">
           <% if @preview_form.total_steps > 1 %>
             <h4>
-              <%= t(".current_step", step: step_index + 1) %> <span class="answer-questionnaire__steps"><%= t(".of_total_steps", total_steps: @preview_form.total_steps) %></span>
+              <%= t(".current_step", step: step_index + 1) %> <span><%= t(".of_total_steps", total_steps: @preview_form.total_steps) %></span>
             </h4>
           <% end %>
 
@@ -39,10 +39,10 @@
           <% end %>
 
           <% if step_index + 1 == @preview_form.total_steps %>
-            <div class="tos-agreement">
+            <div>
               <%= form.check_box :tos_agreement, label: t(".tos_agreement"), id: "questionnaire_tos_agreement", disabled: false %>
               <div class="help-text">
-                <%= decidim_sanitize translated_attribute questionnaire.tos %>
+                <%= decidim_sanitize_translated questionnaire.tos %>
               </div>
             </div>
           <% end %>

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

@@ -1,8 +1,8 @@
 /* eslint-disable no-var, prefer-template */
 (function () {
-  var $preview = $(".choose-template-preview");
-  var $templateName = $(".template-name");
-  var $templateDescription = $(".template-description");
+  var $preview = $("[data-choose-template-preview]");
+  var $templateName = $("[data-template-name]");
+  var $templateDescription = $("[data-template-description]");
 
   $templateName.html("<%= translated_attribute @template.name %>");
   $templateDescription.html("<%= translated_attribute @template.description %>");

data/config/locales/bg.yml

@@ -72,8 +72,8 @@ bg:
           index:
             component_constraint: Добавяне на ограничение
             confirm_delete: Сигурни ли сте, че желаете да изтриете този шаблон?
-            global_scope: Глобално (достъпно навсякъде)
-            internal_state: Вътрешно състояние
+            missing_state: Липсващо състояние
+            proposal_state_id: Вътрешно състояние
             title: Отговори на предложенията
           new:
             title: Нов шаблон за отговор на предложение

data/config/locales/ca.yml

@@ -72,8 +72,8 @@ ca:
           index:
             component_constraint: Afegir restricció
             confirm_delete: Segur que vols eliminar aquesta plantilla?
-            global_scope: Global (disponible a tot arreu)
-            internal_state: Estat intern
+            missing_state: Hi manca l'estat
+            proposal_state_id: Estat intern
             title: Respostes a la proposta
           new:
             title: Nova plantilla de resposta a proposta

data/config/locales/cs.yml

@@ -72,8 +72,8 @@ cs:
           index:
             component_constraint: Přidat omezení
             confirm_delete: Opravdu chcete tuto šablonu odstranit?
-            global_scope: Globální (k dispozici všude)
-            internal_state: Vnitřní stav
+            missing_state: Chybějící stav
+            proposal_state_id: Vnitřní stav
             title: Odpovědi na návrh
           new:
             title: Nová šablona odpovědi na návrh

data/config/locales/de.yml

@@ -72,8 +72,8 @@ de:
           index:
             component_constraint: Einschränkung hinzufügen
             confirm_delete: Möchten Sie diese Vorlage wirklich löschen?
-            global_scope: Global (überall verfügbar)
-            internal_state: Interner Status
+            missing_state: Fehlender Status
+            proposal_state_id: Interner Status
             title: Vorschlagsantworten
           new:
             title: Neue Vorlage für Vorschlagsantworten

data/config/locales/en.yml

@@ -72,8 +72,8 @@ en:
           index:
             component_constraint: Add constraint
             confirm_delete: Are you sure you want to delete this template?
-            global_scope: Global (available everywhere)
-            internal_state: Internal state
+            missing_state: Missing state
+            proposal_state_id: Internal state
             title: Proposal answers
           new:
             title: New proposal answer template

data/config/locales/es-MX.yml

@@ -72,8 +72,8 @@ es-MX:
           index:
             component_constraint: Añadir restricción
             confirm_delete: '¿Seguro que quieres eliminar esta plantilla?'
-            global_scope: Global (disponible en todas partes)
-            internal_state: Estado interno
+            missing_state: Falta el estado
+            proposal_state_id: Estado interno
             title: Respuestas a propuestas
           new:
             title: Nueva la plantilla de respuesta a propuesta

data/config/locales/es-PY.yml

@@ -72,8 +72,8 @@ es-PY:
           index:
             component_constraint: Añadir restricción
             confirm_delete: '¿Seguro que quieres eliminar esta plantilla?'
-            global_scope: Global (disponible en todas partes)
-            internal_state: Estado interno
+            missing_state: Falta el estado
+            proposal_state_id: Estado interno
             title: Respuestas a propuestas
           new:
             title: Nueva la plantilla de respuesta a propuesta

data/config/locales/es.yml

@@ -72,8 +72,8 @@ es:
           index:
             component_constraint: Añadir restricción
             confirm_delete: '¿Seguro que quieres eliminar esta plantilla?'
-            global_scope: Global (disponible en todas partes)
-            internal_state: Estado interno
+            missing_state: Falta el estado
+            proposal_state_id: Estado interno
             title: Respuestas a propuestas
           new:
             title: Nueva la plantilla de respuesta a propuesta

data/config/locales/eu.yml

@@ -72,8 +72,8 @@ eu:
           index:
             component_constraint: Gehitu hertsapena.
             confirm_delete: Ziur zaude txantiloi hau ezabatu nahi duzula?
-            global_scope: Globala (nonahi eskuragarri)
-            internal_state: Barne egoera
+            missing_state: Egoera desagertua
+            proposal_state_id: Barne egoera
             title: Proposamenen erantzunak
           new:
             title: Proposamenaren erantzun-txantilioi berria

data/config/locales/fi-plain.yml

@@ -27,7 +27,7 @@ fi-pl:
           success: Mallipohjan poisto onnistui.
         empty: Mallipohjia ei ole vielä lisätty.
         fetch:
-          error: Mallipohjaa ei löytynyt. Lataa sivu uudestaan.
+          error: Mallipohjaa ei löytynyt. Lataa sivu uudelleen.
         missing_resource: "(puuttuva resurssi)"
         update:
           error: Mallipohjan päivitys epäonnistui.
@@ -72,8 +72,8 @@ fi-pl:
           index:
             component_constraint: Lisää rajaussääntö
             confirm_delete: Haluatko varmasti poistaa tämän mallipohjan?
-            global_scope: Yleinen (saatavilla kaikkialla)
-            internal_state: Sisäinen tila
+            missing_state: Puuttuva tila
+            proposal_state_id: Sisäinen tila
             title: Ehdotusten vastaukset
           new:
             title: Uusi ehdotusten vastausten mallipohja

data/config/locales/fi.yml

@@ -27,7 +27,7 @@ fi:
           success: Mallipohjan poisto onnistui.
         empty: Mallipohjia ei ole vielä lisätty.
         fetch:
-          error: Mallipohjaa ei löytynyt. Lataa sivu uudestaan.
+          error: Mallipohjaa ei löytynyt. Lataa sivu uudelleen.
         missing_resource: "(puuttuva resurssi)"
         update:
           error: Mallipohjan päivitys epäonnistui.
@@ -72,8 +72,8 @@ fi:
           index:
             component_constraint: Lisää rajaussääntö
             confirm_delete: Haluatko varmasti poistaa tämän mallipohjan?
-            global_scope: Yleinen (saatavilla kaikkialla)
-            internal_state: Sisäinen tila
+            missing_state: Puuttuva tila
+            proposal_state_id: Sisäinen tila
             title: Ehdotusten vastaukset
           new:
             title: Uusi ehdotusten vastausten mallipohja

data/config/locales/fr-CA.yml

@@ -72,8 +72,8 @@ fr-CA:
           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
+            missing_state: Etat manquant
+            proposal_state_id: Etat interne
             title: Réponses à la proposition
           new:
             title: Nouveau modèle de réponse à proposition

data/config/locales/fr.yml

@@ -72,8 +72,8 @@ fr:
           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
+            missing_state: Etat manquant
+            proposal_state_id: Etat interne
             title: Réponses à la proposition
           new:
             title: Nouveau modèle de réponse à proposition

data/config/locales/hu.yml

@@ -45,7 +45,6 @@ hu:
           form:
             save: Mentés
           index:
-            global_scope: Globális
             title: Javaslat válaszok
         questionnaire_templates:
           choose:

data/config/locales/ja.yml

@@ -72,8 +72,8 @@ ja:
           index:
             component_constraint: 制約を追加
             confirm_delete: このテンプレートを削除してもよろしいですか？
-            global_scope: グローバル (どこでも利用可能)
-            internal_state: 内部状態
+            missing_state: 状態がありません
+            proposal_state_id: 内部状態
             title: 提案の回答
           new:
             title: 新しい提案回答テンプレート

data/config/locales/pl.yml

@@ -72,8 +72,8 @@ pl:
           index:
             component_constraint: Dodaj ograniczenie
             confirm_delete: Czy na pewno chcesz usunąć ten szablon?
-            global_scope: Globalny (dostępny wszędzie)
-            internal_state: Stan wewnętrzny
+            missing_state: Brakujący stan
+            proposal_state_id: Stan wewnętrzny
             title: Odpowiedzi na propozycję
           new:
             title: Nowy szablon odpowiedzi na propozycję

data/config/locales/sv.yml

@@ -11,52 +11,21 @@ sv:
     admin:
       menu:
         templates: Mallar
-      templates:
-        actions:
-          new_template: Ny mall
-        apply:
-          error: Det gick inte att tillämpa mallen.
-          success: Mallen har tillämpats.
-        copy:
-          error: Det gick inte att kopiera mallen.
-          success: Mallen har kopierats.
-        create:
-          error: Det gick inte att skapa mallen.
-          success: Mallen har skapats.
-        destroy:
-          success: Mallen har tagits bort.
-        empty: Det finns inga mallar ännu.
-        fetch:
-          error: Kunde inte hitta mallen. Ladda om sidan.
-        missing_resource: "(saknad resurs)"
-        update:
-          error: Det gick inte att uppdatera mallen.
-          success: Mallen har uppdaterats.
       titles:
-        template_types:
-          questionnaires: Mallar för enkäter
         templates: Mallar
     models:
-      questionnaire_template:
-        fields:
-          questions: Antal frågor
-          title: Titel på enkät
       template:
         fields:
-          created_at: Skapad
+          created_at: Skapad den
         name: Mall
     templates:
       admin:
         block_user_templates:
           form:
             save: Spara
-          index:
-            confirm_delete: Är det säkert att du vill ta bort mallen?
         proposal_answer_templates:
           form:
             save: Spara
-          index:
-            global_scope: Globalt (tillgängligt överallt)
         questionnaire_templates:
           choose:
             label: Välj mall
@@ -66,7 +35,7 @@ sv:
             edit: Redigera
             questionnaire: Enkät
           preview:
-            current_step: Steg %{step}
+            current_step: Steg %{step} av
             of_total_steps: av %{total_steps}
       template_types:
         questionnaires: Enkäter

data/config/locales/tr-TR.yml

@@ -38,7 +38,8 @@ tr:
           form:
             save: Kaydet
           index:
-            internal_state: İçsel durum
+            missing_state: Kayıp Durum
+            proposal_state_id: İçsel durum
         questionnaire_templates:
           choose:
             create_from_template: Şablondan Oluştur

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.1.0"
+  s.required_ruby_version = "~> 3.2.0"
 
   s.name = "decidim-templates"
   s.summary = "A decidim templates module"
@@ -32,10 +32,10 @@ Gem::Specification.new do |s|
 
   s.add_dependency "decidim-core", Decidim::Templates.version
   s.add_dependency "decidim-forms", Decidim::Templates.version
+  s.add_dependency "decidim-proposals", Decidim::Templates.version
 
   s.add_development_dependency "decidim-admin", Decidim::Templates.version
   s.add_development_dependency "decidim-dev", Decidim::Templates.version
   s.add_development_dependency "decidim-participatory_processes", Decidim::Templates.version
-  s.add_development_dependency "decidim-proposals", Decidim::Templates.version
   s.add_development_dependency "decidim-surveys", Decidim::Templates.version
 end

data/lib/decidim/templates/test/factories.rb

@@ -19,12 +19,6 @@ FactoryBot.define do
       target { :user_block }
     end
 
-    trait :proposal_answer do
-      templatable { organization }
-      target { :proposal_answer }
-      field_values { { internal_state: :accepted } }
-    end
-
     ## Questionnaire templates
     factory :questionnaire_template do
       transient do

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

@@ -31,7 +31,7 @@ shared_examples_for "copies all questionnaire contents" do
     end
 
     def check_answer_options(source_question, new_question)
-      expect(source_question.answer_options.count).to eq(new_question.answer_options.count)
+      expect(source_question.answer_options.size).to eq(new_question.answer_options.size)
 
       source_question.answer_options.each_with_index do |source_answer_option, idx|
         new_answer_option = new_question.answer_options[idx]
@@ -41,7 +41,7 @@ shared_examples_for "copies all questionnaire contents" do
     end
 
     def check_matrix_rows(source_question, new_question)
-      expect(source_question.matrix_rows.count).to eq(new_question.matrix_rows.count)
+      expect(source_question.matrix_rows.size).to eq(new_question.matrix_rows.size)
 
       source_question.matrix_rows.each_with_index do |source_matrix_row, idx|
         new_matrix_row = new_question.matrix_rows[idx]
@@ -52,7 +52,7 @@ shared_examples_for "copies all questionnaire contents" do
     end
 
     def check_display_conditions(source_display_conditions, new_display_conditions)
-      expect(source_display_conditions.count).to eq(new_display_conditions.count)
+      expect(source_display_conditions.size).to eq(new_display_conditions.size)
 
       source_display_conditions.each_with_index do |source_matrix_row, idx|
         new_matrix_row = new_display_conditions[idx]

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

@@ -15,7 +15,7 @@ shared_examples_for "uses questionnaire templates" do |_questionnaire_for|
       end
 
       it "does not show the template selection screen" do
-        expect(page).not_to have_content("Choose template")
+        expect(page).to have_no_content("Choose template")
       end
     end
 
@@ -33,7 +33,7 @@ shared_examples_for "uses questionnaire templates" do |_questionnaire_for|
         end
 
         it "does not show the template selection screen" do
-          expect(page).not_to have_content("Choose template")
+          expect(page).to have_no_content("Choose template")
         end
       end
 
@@ -57,7 +57,7 @@ shared_examples_for "uses questionnaire templates" do |_questionnaire_for|
           page.find("input[name='select-template']").click
 
           within "#template-list", visible: :hidden do
-            expect(page).to have_selector("option", visible: :hidden, count: 6)
+            expect(page).to have_css("option", visible: :hidden, count: 6)
           end
         end
 
@@ -95,13 +95,13 @@ shared_examples_for "uses questionnaire templates" do |_questionnaire_for|
         expect(page).to have_content(template.templatable.title["en"])
       end
 
-      click_button "Create from template"
+      click_on "Create from template"
     end
 
     it "copies the template data to the questionnaire on submit" do
       within "form.edit_questionnaire" do
-        click_button "Expand all"
-        expect(page.find("#questionnaire_title_en").value).to eq(template.templatable.title["en"])
+        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
     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.28.3"
+      "0.29.0.rc1"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-templates
 version: !ruby/object:Gem::Version
-  version: 0.28.3
+  version: 0.29.0.rc1
 platform: ruby
 authors:
 - Vera Rojman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-10 00:00:00.000000000 Z
+date: 2024-07-16 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.28.3
+        version: 0.29.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-forms
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.29.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
-  name: decidim-admin
+  name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
-  type: :development
+        version: 0.29.0.rc1
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
-  name: decidim-dev
+  name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
-  name: decidim-participatory_processes
+  name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
-  name: decidim-proposals
+  name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-surveys
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.29.0.rc1
 description: This module provides a solution to create templates for different Decidim
   models, such as Proposals and Questionnaires..
 email:
@@ -271,14 +271,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: A decidim templates module