decidim-templates 0.26.2 → 0.27.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66cab5d91cbe751cfd6224c0c70cec92c0e4e23a881b21e690c024756d38be50
-  data.tar.gz: 9f9c3eea9bb5ed2ccc9c20f3f7aff351559e57fd842d1e2d6f364c9bd2b9d7bc
+  metadata.gz: e95bae92cbcb5a9ea9c38b3cbcc3d5fc6e02657193a5a93f5f9f5bcd1eb3f580
+  data.tar.gz: 18b92b7051161f75f7295e45b8ebb39d62873554378d9c74be93479d655ef790
 SHA512:
-  metadata.gz: f8e4d2e3dce2d8f1f2e7b1f85df2dad8630440ec79b5268ba9f8bb5f49769a272d253cf6dad60c00f64719a8dcb51c817810f33b6dc742ea3c0301162c8bfdb8
-  data.tar.gz: e982bc8d5322e8274aec1d19cf29f82909a7b4edbbc2c99fa1b8d64aee7bae3160ad9712bcf1045c3abaf168861b41f5b01590ed4cec6a01dd3522796513a441
+  metadata.gz: 6add0aa5a05fa3d04ab9839163df4d69d760e15e4cb8fa1257bf0d13f8b4ec545f1b37602ff1fddda51a6de1e42bbd4fb68b2b6bc9d9cea0267688b489b14782
+  data.tar.gz: 9ea51620c67c5a2e2eb924774cfa4425a3a1e1388c7865907c927b4780e73b997563234bfa963f462cbc78b831f6fb681973018cbee0b28e8a194ed688ff438c

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

@@ -4,7 +4,7 @@ module Decidim
   module Templates
     # A command with all the business logic when duplicating a questionnaire template
     module Admin
-      class ApplyQuestionnaireTemplate < Rectify::Command
+      class ApplyQuestionnaireTemplate < Decidim::Command
         include Decidim::Templates::Admin::QuestionnaireCopier
 
         # Public: Initializes the command.

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

@@ -4,14 +4,15 @@ module Decidim
   module Templates
     # A command with all the business logic when duplicating a questionnaire template
     module Admin
-      class CopyQuestionnaireTemplate < Rectify::Command
+      class CopyQuestionnaireTemplate < Decidim::Command
         include Decidim::Templates::Admin::QuestionnaireCopier
 
         # Public: Initializes the command.
         #
         # template - A template we want to duplicate
-        def initialize(template)
+        def initialize(template, user)
           @template = template
+          @user = user
         end
 
         # Executes the command. Broadcasts these events:
@@ -23,9 +24,11 @@ module Decidim
         def call
           return broadcast(:invalid) unless @template.valid?
 
-          Template.transaction do
-            copy_template
-            copy_questionnaire_questions(@template.templatable, @copied_template.templatable)
+          Decidim.traceability.perform_action!("duplicate", @template, @user) do
+            Template.transaction do
+              copy_template
+              copy_questionnaire_questions(@template.templatable, @copied_template.templatable)
+            end
           end
 
           broadcast(:ok, @copied_template)

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

@@ -4,7 +4,7 @@ module Decidim
   module Templates
     module Admin
       # Creates a QuestionnaireTemplate.
-      class CreateQuestionnaireTemplate < Rectify::Command
+      class CreateQuestionnaireTemplate < Decidim::Command
         # Initializes the command.
         #
         # form - The source for this QuestionnaireTemplate.

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

@@ -4,7 +4,7 @@ module Decidim
   module Templates
     module Admin
       # This command deals with destroying a template from the admin panel.
-      class DestroyTemplate < Rectify::Command
+      class DestroyTemplate < Decidim::Command
         # Public: Initializes the command.
         #
         # template - The Template to be destroyed.

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

@@ -7,7 +7,7 @@ module Decidim
       module QuestionnaireCopier
         def copy_questionnaire_questions(original_questionnaire, new_questionnaire)
           # start by copying the questions so that they already exist when cross referencing them in the conditions
-          original_questionnaire.questions.includes(:answer_options, :matrix_rows, :display_conditions).load
+          original_questionnaire.reload.questions.includes(:answer_options, :matrix_rows, :display_conditions)
           original_questionnaire.questions.each do |original_question|
             new_question = original_question.dup
             new_question.questionnaire = new_questionnaire
@@ -49,6 +49,7 @@ module Decidim
               new_display_condition.answer_option = find_answer_option_by_body(destination_question_to_be_checked.answer_options, original_display_condition.answer_option.body)
             end
             new_display_condition.save!
+            destination_question.display_conditions << new_display_condition
           end
         end
 

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

@@ -4,7 +4,7 @@ module Decidim
   module Templates
     module Admin
       # Updates the questionnaire template given form data.
-      class UpdateTemplate < Rectify::Command
+      class UpdateTemplate < Decidim::Command
         # Initializes the command.
         #
         # template - The Template to update.

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

@@ -54,7 +54,7 @@ module Decidim
         def copy
           enforce_permission_to :copy, :template
 
-          CopyQuestionnaireTemplate.call(template) do
+          CopyQuestionnaireTemplate.call(template, current_user) do
             on(:ok) do
               flash[:notice] = I18n.t("templates.copy.success", scope: "decidim.admin")
               redirect_to action: :index

data/app/models/decidim/templates/template.rb

@@ -11,6 +11,8 @@
 module Decidim
   module Templates
     class Template < ApplicationRecord
+      include Decidim::Traceable
+
       belongs_to :organization,
                  foreign_key: "decidim_organization_id",
                  class_name: "Decidim::Organization"
@@ -28,6 +30,10 @@ module Decidim
       def destroy_templatable
         templatable.destroy
       end
+
+      def self.log_presenter_class_for(_log)
+        Decidim::Templates::AdminLog::TemplatePresenter
+      end
     end
   end
 end

data/app/packs/entrypoints/decidim_templates.js

@@ -1,3 +1,4 @@
+import "src/decidim/templates/admin/choose_template"
 import "entrypoints/decidim_templates.scss";
 
 // Images

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

@@ -0,0 +1,30 @@
+import { datalistSelect } from "src/decidim/datalist_select";
+
+$(() => {
+  const wrapper = document.querySelector("#choose-template");
+  if (!wrapper) {
+    return;
+  }
+
+  const preview = (id) => {
+    const options = wrapper.dataset;
+    const previewURL = options.previewurl;
+    if (!previewURL) {
+      return;
+    }
+    const params = new URLSearchParams({ id: id });
+    fetch(`${previewURL}?${params.toString()}`, {
+      method: "GET",
+      headers: { "Content-Type": "application/json" }
+    }).then((response) => response.text()).then((data) => {
+      const script = document.createElement("script");
+      script.type = "text/javascript";
+      script.innerHTML = data;
+      document.getElementsByTagName("head")[0].appendChild(script);
+    }).catch((error) => {
+      console.error(error); // eslint-disable-line no-console
+    });
+  }
+
+  datalistSelect(wrapper, preview)
+})

data/app/presenters/decidim/templates/admin_log/template_presenter.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Templates
+    module AdminLog
+      # This class holds the logic to present a `Decidim::Template`
+      # for the `AdminLog` log.
+      #
+      # Usage should be automatic and you shouldn't need to call this class
+      # directly, but here's an example:
+      #
+      #    action_log = Decidim::ActionLog.last
+      #    view_helpers # => this comes from the views
+      #    TemplatePresenter.new(action_log, view_helpers).present
+      class TemplatePresenter < Decidim::Log::BasePresenter
+        private
+
+        def diff_fields_mapping
+          {
+            name: :i18n,
+            description: :i18n
+          }
+        end
+
+        def action_string
+          case action
+          when "create", "update", "delete", "duplicate"
+            "decidim.templates.admin_log.template.#{action}"
+          else
+            super
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -12,9 +12,18 @@
     </div>
 
     <%= decidim_form_for([questionnaire], url: decidim_admin_templates.apply_questionnaire_templates_url(questionnaire_id: questionnaire, url: request.url), method: :post, html: { class: "form choose_questionnaire_templates" }) do |form| %>
-      <div class="row column">
-        <%= select_template form, templates %>
-      </div>
+      <%= datalist_select(templates,
+        {
+          id: "choose-template",
+          list: "template-list",
+          label: t(".label"),
+          name: "select-template",
+          placeholder: t("placeholder", scope: "decidim.templates.admin.questionnaire_templates.choose"),
+          data: {
+            previewurl: decidim_admin_templates.preview_questionnaire_templates_url(format: :js)
+          }
+        }
+      ) { form.hidden_field :questionnaire_template_id } %>
 
       <div class="card-section questionnaire-template-preview">
         <h3 class="template-name"></h3>
@@ -32,4 +41,5 @@
   </div>
 </div>
 
+<%= javascript_pack_tag "decidim_templates" %>
 <%= stylesheet_pack_tag "decidim_templates", media: "all" %>

data/config/locales/ar.yml

@@ -1,3 +1,4 @@
+---
 ar:
   activemodel:
     attributes:

data/config/locales/ca.yml

@@ -1,3 +1,4 @@
+---
 ca:
   activemodel:
     attributes:
@@ -63,5 +64,11 @@ ca:
             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:
         questionnaires: Qüestionari

data/config/locales/cs.yml

@@ -1,3 +1,4 @@
+---
 cs:
   activemodel:
     attributes:
@@ -63,5 +64,11 @@ cs:
             current_step: Krok %{step}
             of_total_steps: z %{total_steps}
             tos_agreement: Zúčastněním souhlasíte s podmínkami služby
+      admin_log:
+        template:
+          create: "%{user_name} vytvořil šablonu dotazníku %{resource_name}"
+          delete: "%{user_name} odstranil šablonu dotazníku %{resource_name}"
+          duplicate: "%{user_name} zkopíroval šablonu dotazníku %{resource_name}"
+          update: "%{user_name} aktualizoval šablonu dotazníku %{resource_name}"
       template_types:
         questionnaires: Dotazníky

data/config/locales/de.yml

@@ -1,4 +1,12 @@
+---
 de:
+  activemodel:
+    attributes:
+      questionnaire:
+        title: Titel
+      template:
+        description: Beschreibung
+        name: Name
   decidim:
     admin:
       menu:

data/config/locales/en.yml

@@ -64,5 +64,11 @@ en:
             current_step: Step %{step}
             of_total_steps: of %{total_steps}
             tos_agreement: By participating you accept its Terms of Service
+      admin_log:
+        template:
+          create: "%{user_name} created the %{resource_name} questionnaire template"
+          delete: "%{user_name} deleted the %{resource_name} questionnaire template"
+          duplicate: "%{user_name} duplicated the %{resource_name} questionnaire template"
+          update: "%{user_name} updated the %{resource_name} questionnaire template"
       template_types:
         questionnaires: Questionnaires

data/config/locales/es-MX.yml

@@ -1,3 +1,4 @@
+---
 es-MX:
   activemodel:
     attributes:
@@ -63,5 +64,11 @@ es-MX:
             current_step: Paso %{step}
             of_total_steps: de %{total_steps}
             tos_agreement: Al participar aceptas los Términos y condiciones de uso
+      admin_log:
+        template:
+          create: "%{user_name} ha creado la plantilla del cuestionario %{resource_name}"
+          delete: "%{user_name} ha eliminado la plantilla del cuestionario %{resource_name}"
+          duplicate: "%{user_name} ha duplicado la plantilla del cuestionario %{resource_name}"
+          update: "%{user_name} ha actualizado la platilla del cuestionario %{resource_name}"
       template_types:
         questionnaires: Cuestionarios

data/config/locales/es-PY.yml

@@ -1,3 +1,4 @@
+---
 es-PY:
   activemodel:
     attributes:
@@ -63,5 +64,11 @@ es-PY:
             current_step: Paso %{step}
             of_total_steps: de %{total_steps}
             tos_agreement: Al participar aceptas los Términos y condiciones de uso
+      admin_log:
+        template:
+          create: "%{user_name} ha creado la plantilla del cuestionario %{resource_name}"
+          delete: "%{user_name} ha eliminado la plantilla del cuestionario %{resource_name}"
+          duplicate: "%{user_name} ha duplicado la plantilla del cuestionario %{resource_name}"
+          update: "%{user_name} ha actualizado la platilla del cuestionario %{resource_name}"
       template_types:
         questionnaires: Cuestionarios

data/config/locales/es.yml

@@ -1,3 +1,4 @@
+---
 es:
   activemodel:
     attributes:
@@ -63,5 +64,11 @@ es:
             current_step: Paso %{step}
             of_total_steps: de %{total_steps}
             tos_agreement: Al participar aceptas los Términos y condiciones de uso
+      admin_log:
+        template:
+          create: "%{user_name} ha creado la plantilla del cuestionario %{resource_name}"
+          delete: "%{user_name} ha eliminado la plantilla del cuestionario %{resource_name}"
+          duplicate: "%{user_name} ha duplicado la plantilla del cuestionario %{resource_name}"
+          update: "%{user_name} ha actualizado la platilla del cuestionario %{resource_name}"
       template_types:
         questionnaires: Cuestionarios

data/config/locales/eu.yml

@@ -1,3 +1,4 @@
+---
 eu:
   activemodel:
     attributes:

data/config/locales/fi-plain.yml

@@ -1,3 +1,4 @@
+---
 fi-pl:
   activemodel:
     attributes:
@@ -63,5 +64,11 @@ fi-pl:
             current_step: Vaihe %{step}
             of_total_steps: / %{total_steps}
             tos_agreement: Osallistumalla hyväksyt käyttöehdot
+      admin_log:
+        template:
+          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:
         questionnaires: Kyselyt

data/config/locales/fi.yml

@@ -1,3 +1,4 @@
+---
 fi:
   activemodel:
     attributes:
@@ -63,5 +64,11 @@ fi:
             current_step: Vaihe %{step}
             of_total_steps: / %{total_steps}
             tos_agreement: Osallistumalla hyväksyt käyttöehdot
+      admin_log:
+        template:
+          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:
         questionnaires: Kyselyt

data/config/locales/fr-CA.yml

@@ -1,3 +1,4 @@
+---
 fr-CA:
   activemodel:
     attributes:
@@ -63,5 +64,11 @@ fr-CA:
             current_step: Étape %{step}
             of_total_steps: de %{total_steps}
             tos_agreement: En participant, vous acceptez ses conditions d'utilisation
+      admin_log:
+        template:
+          create: "%{user_name} a créé le modèle de questionnaire %{resource_name}"
+          delete: "%{user_name} a supprimé le modèle de questionnaire %{resource_name}"
+          duplicate: "%{user_name} a dupliqué le modèle de questionnaire %{resource_name}"
+          update: "%{user_name} a modifié le modèle de questionnaire %{resource_name}"
       template_types:
         questionnaires: Questionnaires

data/config/locales/fr.yml

@@ -1,3 +1,4 @@
+---
 fr:
   activemodel:
     attributes:
@@ -63,5 +64,11 @@ fr:
             current_step: Étape %{step}
             of_total_steps: sur %{total_steps}
             tos_agreement: En participant, vous acceptez ces conditions d'utilisation
+      admin_log:
+        template:
+          create: "%{user_name} a créé le modèle de questionnaire %{resource_name}"
+          delete: "%{user_name} a supprimé le modèle de questionnaire %{resource_name}"
+          duplicate: "%{user_name} a dupliqué le modèle de questionnaire %{resource_name}"
+          update: "%{user_name} a modifié le modèle de questionnaire %{resource_name}"
       template_types:
         questionnaires: Questionnaires

data/config/locales/ga-IE.yml

@@ -1,3 +1,4 @@
+---
 ga:
   activemodel:
     attributes:

data/config/locales/gl.yml

@@ -1,3 +1,4 @@
+---
 gl:
   activemodel:
     attributes:

data/config/locales/hu.yml

@@ -1 +1,74 @@
+---
 hu:
+  activemodel:
+    attributes:
+      questionnaire:
+        title: Cím
+      template:
+        description: Leírás
+        name: Név
+  decidim:
+    admin:
+      menu:
+        templates: Sablonok
+      templates:
+        apply:
+          error: Probléma merült fel a sablon alkalmazása során.
+          success: Sablon sikeresen alkalmazva
+        copy:
+          error: Probléma merült fel a sablon másolása során.
+          success: Sablon sikeresen másolva
+        create:
+          error: Probléma történt az sablon létrehozásakor.
+          success: Sablon létrhehozása sikeres
+        destroy:
+          success: Sablon törlése sikeres
+        empty: Nincsenek még sablonok.
+        update:
+          error: Probléma merült fel a sablon frissítése során.
+          success: A sablon sikeresen frissült
+      titles:
+        template_types:
+          questionnaires: Kérdőív-sablonok
+        templates: Sablonok
+    models:
+      questionnaire_template:
+        fields:
+          questions: Kérdések száma
+          title: Kérdõív címe
+      template:
+        fields:
+          created_at: 'Létrehozva:'
+        name: Sablon
+    templates:
+      admin:
+        questionnaire_templates:
+          choose:
+            create_from_template: Létrehozás sablonból
+            description: Egy új kérdőív létrehozására készült. Választhatsz előre létrehozott sablonok közül amelyeket később módosíthatsz.
+            label: Válassz egy sablont
+            placeholder: Válassz egy sablont
+            skip_template: Átugrás
+          edit:
+            edit: Szerkesztés
+            empty: Még nincsenek kérdések
+            questionnaire: Kérdőív
+          form:
+            save: Mentés
+            template_title: Sablon információi
+            title: Kérdőív sablon %{questionnaire_for}
+          index:
+            confirm_delete: Biztos törölni szeretné a sablont?
+            title: Kérdőív-sablonok
+          preview:
+            current_step: Lépés %{step}
+            of_total_steps: 'ennyiből: %{total_steps}'
+            tos_agreement: A részvétellel elfogadja az Általános Szerződési Feltételeket
+      admin_log:
+        template:
+          create: "%{user_name} létrehozta a(z) %{resource_name} kérdőív sablont"
+          delete: "%{user_name} törölte a(z) %{resource_name} kérdőív sablont"
+          duplicate: "%{user_name} duplikálta a(z) %{resource_name} kérdőív sablont"
+          update: "%{user_name} frissítette a(z) %{resource_name} kérdőív sablont"
+      template_types:
+        questionnaires: Kérdőívek

data/config/locales/it.yml

@@ -1,3 +1,4 @@
+---
 it:
   activemodel:
     attributes:

data/config/locales/ja.yml

@@ -1,3 +1,4 @@
+---
 ja:
   activemodel:
     attributes:
@@ -63,5 +64,11 @@ ja:
             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:
         questionnaires: アンケート

data/config/locales/lt.yml

@@ -1 +1,74 @@
+---
 lt:
+  activemodel:
+    attributes:
+      questionnaire:
+        title: Pavadinimas
+      template:
+        description: Aprašymas
+        name: Pavadinimas
+  decidim:
+    admin:
+      menu:
+        templates: Šablonai
+      templates:
+        apply:
+          error: Pritaikant šį šabloną iškilo problema.
+          success: Šablonas sėkmingai pritaikytas
+        copy:
+          error: Kopijuojant šį šabloną iškilo problema.
+          success: Šablonas pritaikytas nukopijuotas
+        create:
+          error: Kuriant šį šabloną iškilo problema.
+          success: Šablonas sukurtas sėkmingai
+        destroy:
+          success: Šablonas ištrintas sėkmingai
+        empty: Dar nėra šablonų.
+        update:
+          error: Atnaujinant šį šabloną kilo problema.
+          success: Šablonas atnaujintas sėkmingai
+      titles:
+        template_types:
+          questionnaires: Klausimyno šablonai
+        templates: Šablonai
+    models:
+      questionnaire_template:
+        fields:
+          questions: Klausimų skaičius
+          title: Klausimyno pavadinimas
+      template:
+        fields:
+          created_at: Sukurta
+        name: Šablonas
+    templates:
+      admin:
+        questionnaire_templates:
+          choose:
+            create_from_template: Kurti iš šablono
+            description: Tuojaus sukursite naują klausimyną. Galite jį kurti iš šablono ir jį pakeisti vėliau.
+            label: Pasirinkti šabloną
+            placeholder: Pasirinkti šabloną
+            skip_template: Praleisti
+          edit:
+            edit: Redaguoti
+            empty: Dar nėra klausimų
+            questionnaire: Klausimynas
+          form:
+            save: Išsaugoti
+            template_title: Šablono informacija
+            title: Klausimyno šablonas %{questionnaire_for}
+          index:
+            confirm_delete: Ar tikrai norite ištrinti šį šabloną?
+            title: Klausimyno šablonai
+          preview:
+            current_step: Žingsnis %{step}
+            of_total_steps: iš%{total_steps}
+            tos_agreement: Dalyvaudami sutinkate su paslaugos teikimo sąlygomis
+      admin_log:
+        template:
+          create: "%{user_name} atnaujino %{resource_name} klausimyno šabloną"
+          delete: "%{user_name} ištrynė %{resource_name} klausimyno šabloną"
+          duplicate: "%{user_name} dublikavo %{resource_name} klausimyno šabloną"
+          update: "%{user_name} atnaujino %{resource_name} klausimyno šabloną"
+      template_types:
+        questionnaires: Klausimynai

data/config/locales/nl.yml

@@ -1,3 +1,4 @@
+---
 nl:
   activemodel:
     attributes:

data/config/locales/no.yml

@@ -1,3 +1,4 @@
+---
 "no":
   activemodel:
     attributes:

data/config/locales/pl.yml

@@ -1,3 +1,4 @@
+---
 pl:
   decidim:
     admin:

data/config/locales/pt-BR.yml

@@ -1,3 +1,4 @@
+---
 pt-BR:
   activemodel:
     attributes:

data/config/locales/pt.yml

@@ -1,3 +1,4 @@
+---
 pt:
   activemodel:
     attributes:

data/config/locales/ro-RO.yml

@@ -1,3 +1,4 @@
+---
 ro:
   activemodel:
     attributes:

data/config/locales/sv.yml

@@ -1,3 +1,4 @@
+---
 sv:
   activemodel:
     attributes:
@@ -21,6 +22,8 @@ sv:
       admin:
         questionnaire_templates:
           choose:
+            label: Välj mall
+            placeholder: Välj mall
             skip_template: Hoppa över
           edit:
             edit: Redigera
@@ -29,3 +32,5 @@ sv:
             save: Spara
           preview:
             current_step: Steg %{step} av
+      template_types:
+        questionnaires: Enkäter

data/config/locales/tr-TR.yml

@@ -1,3 +1,4 @@
+---
 tr:
   decidim:
     admin:

data/config/locales/zh-CN.yml

@@ -1,3 +1,4 @@
+---
 zh-CN:
   decidim:
     admin:

data/db/seeds.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-if !Rails.env.production? || ENV["SEED"]
+if !Rails.env.production? || ENV.fetch("SEED", nil)
   print "Creating seeds for decidim-templates...\n" unless Rails.env.test?
 
   require "decidim/faker/localized"

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

@@ -9,7 +9,7 @@ shared_examples_for "uses questionnaire templates" do |_questionnaire_for|
     context "when there are no templates" do
       before do
         questionnaire.update_columns(
-          created_at: Time.zone.now - 1.day,
+          created_at: 1.day.ago,
           updated_at: Time.zone.now
         )
       end
@@ -27,7 +27,7 @@ shared_examples_for "uses questionnaire templates" do |_questionnaire_for|
       context "when it is an existing questionnaire" do
         before do
           questionnaire.update_columns(
-            created_at: Time.zone.now - 1.day,
+            created_at: 1.day.ago,
             updated_at: Time.zone.now
           )
         end
@@ -53,16 +53,17 @@ shared_examples_for "uses questionnaire templates" do |_questionnaire_for|
           expect(page).to have_content("Choose template")
         end
 
-        it "loads the last 5 templates in the select" do
-          page.find(".Select-control").click
+        it "loads the templates in the select" do
+          page.find("input[name='select-template']").click
 
-          within ".Select-menu" do
-            expect(page).to have_selector(".Select-option:not(.is-focused)", count: 5)
+          within "#template-list", visible: :hidden do
+            expect(page).to have_selector("option", visible: :hidden, count: 6)
           end
         end
 
         it "displays the preview when a template is selected" do
-          autocomplete_select template.name["en"], from: :questionnaire_template_id
+          select(template.name["en"], from: "select-template")
+
           within ".questionnaire-template-preview" do
             expect(page).to have_i18n_content(template.name)
             expect(page).to have_i18n_content(question.body)
@@ -88,7 +89,7 @@ shared_examples_for "uses questionnaire templates" do |_questionnaire_for|
       )
       visit questionnaire_edit_path
 
-      autocomplete_select template.name["en"], from: :questionnaire_template_id
+      select(template.name["en"], from: "select-template")
 
       within ".create-from-template" do
         find("*[type=submit]").click

data/lib/decidim/templates/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-templates version.
   module Templates
     def self.version
-      "0.26.2"
+      "0.27.0.rc2"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-templates
 version: !ruby/object:Gem::Version
-  version: 0.26.2
+  version: 0.27.0.rc2
 platform: ruby
 authors:
 - Vera Rojman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-14 00:00:00.000000000 Z
+date: 2022-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-forms
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc2
 description: This module provides a solution to create templates for different Decidim
   models, such as Proposals and Questionnaires..
 email:
@@ -89,7 +89,6 @@ files:
 - app/controllers/decidim/templates/admin/questionnaire_templates_controller.rb
 - app/controllers/decidim/templates/application_controller.rb
 - app/forms/decidim/templates/admin/template_form.rb
-- app/helpers/decidim/templates/admin/templates_helper.rb
 - app/helpers/decidim/templates/application_helper.rb
 - app/models/concerns/decidim/templates/templatable.rb
 - app/models/decidim/templates/application_record.rb
@@ -97,8 +96,10 @@ files:
 - app/packs/entrypoints/decidim_templates.js
 - app/packs/entrypoints/decidim_templates.scss
 - app/packs/images/decidim/templates/decidim_templates.svg
+- app/packs/src/decidim/templates/admin/choose_template.js
 - app/packs/stylesheets/decidim/templates/templates.scss
 - app/permissions/decidim/templates/admin/permissions.rb
+- app/presenters/decidim/templates/admin_log/template_presenter.rb
 - app/views/decidim/templates/admin/questionnaire_templates/_choose.html.erb
 - app/views/decidim/templates/admin/questionnaire_templates/_form.html.erb
 - app/views/decidim/templates/admin/questionnaire_templates/_preview.html.erb
@@ -188,14 +189,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: A decidim templates module

data/app/helpers/decidim/templates/admin/templates_helper.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Templates
-    module Admin
-      # Custom helpers, scoped to the templates engine.
-      #
-      module TemplatesHelper
-        def select_template(form, templates)
-          prompt_options = {
-            url: decidim_admin_templates.questionnaire_templates_url(format: :json),
-            change_url: decidim_admin_templates.preview_questionnaire_templates_url(format: :js),
-            placeholder: t("placeholder", scope: "decidim.templates.admin.questionnaire_templates.choose")
-          }
-
-          default_options = templates.last(5).map { |questionnaire_template| { value: questionnaire_template.id, label: translated_attribute(questionnaire_template.name) } }
-
-          form.autocomplete_select(
-            :questionnaire_template_id,
-            false,
-            {
-              multiple: false,
-              label: t("label", scope: "decidim.templates.admin.questionnaire_templates.choose"),
-              default_options: default_options
-            },
-            prompt_options
-          )
-        end
-      end
-    end
-  end
-end