decidim-templates 0.26.9 → 0.27.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6bfaef39c2fa6a2d1cff2269d8004dc4f463c73cb88eaee81e97ef8d5a9e973
-  data.tar.gz: 6a63b7701627db0416723d1efce6b36deba936cd791ffc87612a328ae581455d
+  metadata.gz: 00fb7813ca553dfef2aa7b56f41da97804c6d27e0e62bc2d616842c4eff820a5
+  data.tar.gz: 37d4edffba55c81d5826439eb6a4b75549f3f891b9fd7d1d6fd482bbb47d4748
 SHA512:
-  metadata.gz: df44039db1e71531ed194034ee3d6fb1880dec8f2e080ab3c393ab911ee95e42af3afdd32ccf1eab55bfd95edb23c9f8df7164ec6fc4950e64d5e8b9e8ba17a3
-  data.tar.gz: 5947d7ca043f30edf9669921a71ef702f858dba86731e4d97a4109e7a20bb0f0afe8da8df48b22686e2ec0f07ca9b8aee405c3e90bf5608d34ae3fb16d4c4aeb
+  metadata.gz: 6b8eb0373fbb853f099283f3dc52a86b69426954ee1dd92fbf2cceeefe67d836c71f2b26e832a14b1fd098d861f226663e457b1ffb6d8a5894282ce3f55ceb75
+  data.tar.gz: 882db5f20769282c34c7065d941a2d65decaa7de86883226eb0f05f5bd2b197a81299b80157349bee87058f7543f496ca30b12b469d9cc083e276c36647af784

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/questionnaires_controller.rb

@@ -33,7 +33,7 @@ module Decidim
           private
 
           def template
-            @template ||= current_organization.templates.where(templatable_type: "Decidim::Forms::Questionnaire").find(params[:id])
+            @template ||= Template.find(params[:id])
           end
         end
       end

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

@@ -8,6 +8,8 @@ module Decidim
       class QuestionnaireTemplatesController < Decidim::Templates::Admin::ApplicationController
         include Decidim::TranslatableAttributes
 
+        skip_before_action :verify_authenticity_token, only: :preview
+
         helper_method :template
 
         def index
@@ -52,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
@@ -140,7 +142,7 @@ module Decidim
         end
 
         def template
-          @template ||= collection.find(params[:id])
+          @template ||= Template.find_by(id: params[:id])
         end
 
         def search(term)

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/permissions/decidim/templates/admin/permissions.rb

@@ -6,7 +6,7 @@ module Decidim
       class Permissions < Decidim::DefaultPermissions
         def permissions
           return permission_action unless user
-          return permission_action unless user.admin?
+
           return permission_action if permission_action.scope != :admin
 
           case permission_action.subject

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/app/views/decidim/templates/admin/questionnaire_templates/edit.html.erb

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t(".questionnaire")) %>
 <%= decidim_form_for(@form, url: questionnaire_template_path, html: { class: "form edit_questionnaire_template" }) do |f| %>
   <%= render partial: "form", object: f %>
 <% end %>

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

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t(".title")) %>
 <div class="card">
   <div class="card-divider">
     <h2 class="card-title">

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

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t("templates", scope: "decidim.admin.titles")) %>
 <% content_for :title do %>
   <%= t("templates", scope: "decidim.admin.titles") %>
 <% end %>

data/config/locales/am-ET.yml

@@ -1 +1,2 @@
+---
 am:

data/config/locales/ar.yml

@@ -1,31 +1,6 @@
+---
 ar:
   activemodel:
     attributes:
       template:
         description: الوصف
-        name: الاسم
-  decidim:
-    admin:
-      menu:
-        templates: النماذج
-      titles:
-        templates: النماذج
-    models:
-      questionnaire_template:
-        fields:
-          questions: عدد الأسئلة
-      template:
-        name: النموذج
-    templates:
-      admin:
-        questionnaire_templates:
-          choose:
-            label: اختيار نموذج
-            placeholder: اختيار نموذج
-            skip_template: تخطي
-          edit:
-            edit: تعديل
-          form:
-            save: حفظ
-          preview:
-            current_step: الخطوة %{step}

data/config/locales/bg.yml

@@ -1 +1,2 @@
+---
 bg:

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/da.yml

@@ -1 +1,2 @@
+---
 da:

data/config/locales/de.yml

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

data/config/locales/el.yml

@@ -1 +1,2 @@
+---
 el:

data/config/locales/en.yml

@@ -25,7 +25,7 @@ en:
           success: Template deleted successfully
         empty: There are no templates yet.
         update:
-          error: There was a problem updating this template.
+          error: There was a problem upadting this template.
           success: Template updated successfully
       titles:
         template_types:
@@ -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/eo.yml

@@ -1 +1,2 @@
+---
 eo:

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/et.yml

@@ -1 +1,2 @@
+---
 et:

data/config/locales/eu.yml

@@ -1,3 +1,4 @@
+---
 eu:
   activemodel:
     attributes:
@@ -24,7 +25,7 @@ eu:
           success: Txantiloia zuzen ezabatu da
         empty: Oraindik ez dago txantiloirik.
         update:
-          error: Arazo bat egon da eztabaida hau eguneratzean.
+          error: Arazo bat izan da txantiloi hau eguneratzean.
           success: Txantiloia zuzen eguneratu da
       titles:
         template_types:
@@ -55,7 +56,7 @@ eu:
           form:
             save: Gorde
             template_title: Txantiloiaren informazioa
-            title: '%{questionnaire_for}% galdetegiaren txantiloia'
+            title: '%{questionnaire_for} galdetegiaren txantiloia'
           index:
             confirm_delete: Ziur zaude txantiloi hau ezabatu nahi duzula?
             title: Galdetegi-txantiloiak

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:
@@ -24,7 +25,7 @@ fr-CA:
           success: Modèle supprimé avec succès
         empty: Il n'y a pas de modèle pour l'instant.
         update:
-          error: Un problème est survenu lors de la mise à jour de ce modèle.
+          error: Une erreur est survenue pendant la mise à jour du modèle.
           success: Modèle mis à jour avec succès
       titles:
         template_types:

data/config/locales/fr.yml

@@ -1,3 +1,4 @@
+---
 fr:
   activemodel:
     attributes:
@@ -24,7 +25,7 @@ fr:
           success: Modèle supprimé avec succès
         empty: Il n'y a pas de modèle pour l'instant.
         update:
-          error: Un problème est survenu lors de la mise à jour de ce modèle.
+          error: Une erreur est survenue pendant la mise à jour du modèle.
           success: Modèle mis à jour avec succès
       titles:
         template_types:

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:
@@ -24,6 +25,7 @@ gl:
           success: Padrón eliminado con éxito
         empty: Aínda non hai padróns.
         update:
+          error: Produciuse un problema ao actualizar o padrón.
           success: Padrón actualizado con éxito
       titles:
         template_types:

data/config/locales/hr.yml

@@ -1 +1,2 @@
+---
 hr:

data/config/locales/hu.yml

@@ -1,66 +1,2 @@
+---
 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:
-          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
-      template_types:
-        questionnaires: Kérdőívek

data/config/locales/id-ID.yml

@@ -1 +1,2 @@
+---
 id: