decidim-templates 0.27.4 → 0.28.0.rc5

data/config/locales/nl.yml

@@ -14,18 +14,11 @@ nl:
       templates:
         apply:
           error: Er is een fout opgetreden bij het bijwerken van dit template.
-          success: Template met succes toegepast
         copy:
           error: Er is een fout opgetreden bij het kopiëren van dit template.
-          success: Template met succes gekopieerd
         create:
           error: Er is een fout opgetreden bij het maken van dit template.
-          success: Template met succes aangemaakt
-        destroy:
-          success: Template met succes verwijderd
         empty: Er zijn nog geen templates.
-        update:
-          success: Template met succes bijgewerkt
       titles:
         template_types:
           questionnaires: Vragenlijst templates
@@ -41,6 +34,12 @@ nl:
         name: Template
     templates:
       admin:
+        block_user_templates:
+          form:
+            save: Opslaan
+        proposal_answer_templates:
+          form:
+            save: Opslaan
         questionnaire_templates:
           choose:
             create_from_template: Met template aanmaken
@@ -50,11 +49,7 @@ nl:
             skip_template: Overslaan
           edit:
             edit: Bewerk
-            empty: Er zijn nog geen vragen
             questionnaire: Vragenlijst
-          form:
-            save: Opslaan
-            template_title: Template informatie
           index:
             confirm_delete: Weet je zeker dat je dit template wilt verwijderen?
             title: Vragenlijst templates

data/config/locales/no.yml

@@ -14,18 +14,11 @@
       templates:
         apply:
           error: Det oppstod et problem med å bruke denne malen.
-          success: Mal lagt til
         copy:
           error: Det oppstod et problem under kopiering av denne malen.
-          success: Malen ble kopiert
         create:
           error: Det oppstod et problem under oppretting av malen.
-          success: Malen er opprettet
-        destroy:
-          success: Malen ble slettet
         empty: Det finnes ingen maler enda.
-        update:
-          success: Mal oppdatert
       titles:
         template_types:
           questionnaires: Maler for spørreskjema
@@ -41,6 +34,12 @@
         name: Mal
     templates:
       admin:
+        block_user_templates:
+          form:
+            save: Lagre
+        proposal_answer_templates:
+          form:
+            save: Lagre
         questionnaire_templates:
           choose:
             create_from_template: Opprett fra mal
@@ -50,11 +49,8 @@
             skip_template: Hopp over
           edit:
             edit: Rediger
-            empty: Det er ingen spørsmål enda
             questionnaire: Spørreskjema
           form:
-            save: Lagre
-            template_title: Informasjon om mal
             title: Spørreskjema mal %{questionnaire_for}
           index:
             confirm_delete: Er du sikker på at du vil slette denne malen?

data/config/locales/pl.yml

@@ -7,18 +7,11 @@ pl:
       templates:
         apply:
           error: Wystąpił błąd z zastosowaniem tego szablonu.
-          success: Szablon został zastosowany
         copy:
           error: Wystąpił błąd podczas kopiowania tego szablonu.
-          success: Szablon został skopiowany
         create:
           error: Wystąpił błąd podczas tworzenia tego szablonu.
-          success: Szablon został utworzony
-        destroy:
-          success: Szablon został usunięty
         empty: Brak szablonów.
-        update:
-          success: Szablon został zaktualizowany
       titles:
         template_types:
           questionnaires: Szablony kwestionariusza
@@ -34,6 +27,12 @@ pl:
         name: Szablon
     templates:
       admin:
+        block_user_templates:
+          form:
+            save: Zapisz
+        proposal_answer_templates:
+          form:
+            save: Zapisz
         questionnaire_templates:
           choose:
             create_from_template: Utwórz z szablonu
@@ -43,11 +42,8 @@ pl:
             skip_template: Pomiń
           edit:
             edit: Edytuj
-            empty: Nie ma jeszcze żadnych pytań
             questionnaire: Kwestionariusz
           form:
-            save: Zapisz
-            template_title: Informacje o szablonie
             title: Szablon kwestionariusza %{questionnaire_for}
           index:
             confirm_delete: Czy na pewno chcesz usunąć ten szablon?

data/config/locales/pt-BR.yml

@@ -14,18 +14,11 @@ pt-BR:
       templates:
         apply:
           error: Ocorreu um erro ao aplicar este modelo.
-          success: Modelo aplicado com sucesso
         copy:
           error: Ocorreu um erro ao copiar este modelo.
-          success: Modelo copiado com sucesso
         create:
           error: Ocorreu um erro ao criar este modelo.
-          success: Modelo criado com sucesso
-        destroy:
-          success: Modelo excluído com sucesso
         empty: Ainda não existem modelos.
-        update:
-          success: Modelo atualizado com sucesso
       titles:
         template_types:
           questionnaires: Modelos de questionário
@@ -41,6 +34,12 @@ pt-BR:
         name: Modelo
     templates:
       admin:
+        block_user_templates:
+          form:
+            save: Salvar
+        proposal_answer_templates:
+          form:
+            save: Salvar
         questionnaire_templates:
           choose:
             create_from_template: Criar a partir de modelo
@@ -50,11 +49,8 @@ pt-BR:
             skip_template: Ignorar
           edit:
             edit: Editar
-            empty: Ainda não há questões
             questionnaire: Questionário
           form:
-            save: Salvar
-            template_title: Informações do Template
             title: Modelo de questionário %{questionnaire_for}
           index:
             confirm_delete: Tem certeza de que deseja excluir este modelo?

data/config/locales/pt.yml

@@ -14,18 +14,11 @@ pt:
       templates:
         apply:
           error: Houve um problema ao aplicar este modelo
-          success: Modelo aplicado com êxito
         copy:
           error: Houve um problema ao copiar este modelo
-          success: Modelo copiado com êxito
         create:
           error: Houve um problema ao criar este modelo.
-          success: Modelo criado com êxito
-        destroy:
-          success: Modelo eliminado com êxito
         empty: Ainda não há modelos.
-        update:
-          success: Modelo actualizado com êxito
       titles:
         template_types:
           questionnaires: Modelos de questionário
@@ -41,6 +34,12 @@ pt:
         name: Modelo
     templates:
       admin:
+        block_user_templates:
+          form:
+            save: Guardar
+        proposal_answer_templates:
+          form:
+            save: Guardar
         questionnaire_templates:
           choose:
             create_from_template: Criar a partir do modelo
@@ -50,11 +49,8 @@ pt:
             skip_template: Saltar
           edit:
             edit: Editar
-            empty: Ainda não há questões
             questionnaire: Questionário
           form:
-            save: Guardar
-            template_title: Informação do modelo
             title: Modelo de questionário %{questionnaire_for}
           index:
             confirm_delete: Tem a certeza que quer apagar este modelo?

data/config/locales/ro-RO.yml

@@ -14,19 +14,19 @@ ro:
       templates:
         apply:
           error: A apărut o eroare la aplicarea acestui șablon.
-          success: Modelul a fost aplicat cu succes
+          success: Șablonul a fost aplicat cu succes.
         copy:
           error: A apărut o eroare la copierea acestui model.
-          success: Modelul a fost copiat cu succes
+          success: Șablonul a fost copiat cu succes.
         create:
           error: A apărut o eroare la crearea acestui model.
-          success: Modelul a fost creat cu succes
+          success: Șablonul a fost creat cu succes.
         destroy:
-          success: Modelul a fost şters cu succes
+          success: Șablonul a fost șters cu succes.
         empty: Nu există încă nici un model.
         update:
           error: A apărut o eroare la actualizarea acestui șablon.
-          success: Modelul a fost actualizat cu succes
+          success: Șablonul a fost importat cu succes.
       titles:
         template_types:
           questionnaires: Şabloane chestionar
@@ -42,6 +42,17 @@ ro:
         name: Model
     templates:
       admin:
+        block_user_templates:
+          form:
+            save: Salvează
+          index:
+            confirm_delete: Sunteți sigur că doriți să ștergeți acest șablon?
+            title: Blochează mesajele utilizatorilor
+          template_chooser:
+            select_template: Selectați un răspuns șablon
+        proposal_answer_templates:
+          form:
+            save: Salvează
         questionnaire_templates:
           choose:
             create_from_template: Creează după model
@@ -51,11 +62,9 @@ ro:
             skip_template: Treci peste
           edit:
             edit: Editează
-            empty: Nu există încă întrebări
+            empty: Nu există încă întrebări.
             questionnaire: Chestionar
           form:
-            save: Salvează
-            template_title: Informatii despre model
             title: Model de chestionar %{questionnaire_for}
           index:
             confirm_delete: Sigur dorești să ștergi acest model?
@@ -71,4 +80,5 @@ ro:
           duplicate: "%{user_name} a duplicat șablonul chestionarului %{resource_name}"
           update: "%{user_name} a actualizat șablonul chestionarului %{resource_name}"
       template_types:
+        block_user: Blochează mesajele utilizatorilor
         questionnaires: Chestionare

data/config/locales/sq-AL.yml

@@ -0,0 +1 @@
+sq:

data/config/locales/sv.yml

@@ -20,6 +20,12 @@ sv:
         name: Mall
     templates:
       admin:
+        block_user_templates:
+          form:
+            save: Spara
+        proposal_answer_templates:
+          form:
+            save: Spara
         questionnaire_templates:
           choose:
             label: Välj mall
@@ -28,8 +34,6 @@ sv:
           edit:
             edit: Redigera
             questionnaire: Enkät
-          form:
-            save: Spara
           preview:
             current_step: Steg %{step} av
             of_total_steps: av %{total_steps}

data/config/locales/th-TH.yml

@@ -0,0 +1 @@
+th:

data/config/locales/tr-TR.yml

@@ -5,20 +5,15 @@ tr:
       menu:
         templates: Şablonlar
       templates:
+        actions:
+          new_template: Yeni şablon
         apply:
           error: Bu şablonu uygularken bir sorun oluştu.
-          success: Şablon başarıyla uygulandı
         copy:
           error: Bu şablonu kopyalarken bir sorun oluştu.
-          success: Şablon başarıyla kopyalandı
         create:
           error: Bu şablonu oluştururken bir hata oluştu.
-          success: Şablon başarıyla oluşturuldu
-        destroy:
-          success: Şablon başarıyla silindi
         empty: Burada henüz şablon yok.
-        update:
-          success: Şablon başarıyla güncellendi
       titles:
         template_types:
           questionnaires: Anket şablonları
@@ -34,6 +29,12 @@ tr:
         name: Şablon
     templates:
       admin:
+        block_user_templates:
+          form:
+            save: Kaydet
+        proposal_answer_templates:
+          form:
+            save: Kaydet
         questionnaire_templates:
           choose:
             create_from_template: Şablondan Oluştur
@@ -43,11 +44,8 @@ tr:
             skip_template: Atla
           edit:
             edit: Düzenle
-            empty: Henüz bir soru yok
             questionnaire: Anket
           form:
-            save: Kaydet
-            template_title: Şablon Bilgisi
             title: '%{questionnaire_for} için anket şablonu'
           index:
             confirm_delete: Bu şablonu silmek istediğinizden emin misiniz?

data/config/locales/zh-CN.yml

@@ -7,18 +7,11 @@ zh-CN:
       templates:
         apply:
           error: 应用此模板时出现问题。
-          success: 模板应用成功
         copy:
           error: 复制此模板时出现问题。
-          success: 模板复制成功
         create:
           error: 创建此模板时出现问题。
-          success: 模板创建成功
-        destroy:
-          success: 模板删除成功
         empty: 尚无模板。
-        update:
-          success: 模板更新成功
       titles:
         template_types:
           questionnaires: 问卷模板
@@ -34,6 +27,12 @@ zh-CN:
         name: 模板
     templates:
       admin:
+        block_user_templates:
+          form:
+            save: 保存
+        proposal_answer_templates:
+          form:
+            save: 保存
         questionnaire_templates:
           choose:
             create_from_template: 从模板创建
@@ -43,11 +42,7 @@ zh-CN:
             skip_template: 跳过
           edit:
             edit: 编辑
-            empty: 还没有问题
             questionnaire: Questionnaire
-          form:
-            save: 保存
-            template_title: 模板信息
           index:
             confirm_delete: 您确定要删除此模板吗？
             title: 问卷模板

data/config/locales/zh-TW.yml

@@ -14,19 +14,19 @@ zh-TW:
       templates:
         apply:
           error: 套用此範本時發生問題。
-          success: 模板成功應用
+          success: 範本成功應用.
         copy:
           error: 複製此範本時發生問題。
-          success: 模板成功複製
+          success: 範本成功複製.
         create:
           error: 建立此範本時發生問題。
-          success: 模板建立成功
+          success: 範本建立成功.
         destroy:
-          success: 模板删除成功
+          success: 範本删除成功.
         empty: 尚未有範本。
         update:
           error: 更新此範本時發生問題。
-          success: 模板更新成功
+          success: 範本更新成功
       titles:
         template_types:
           questionnaires: 問卷範本
@@ -42,6 +42,17 @@ zh-TW:
         name: 範本
     templates:
       admin:
+        block_user_templates:
+          form:
+            save: 儲存
+          index:
+            confirm_delete: 您是否確定要刪除本範本？
+            title: 封鎖使用者訊息
+          template_chooser:
+            select_template: 選擇範本回答
+        proposal_answer_templates:
+          form:
+            save: 儲存
         questionnaire_templates:
           choose:
             create_from_template: 從範本建立
@@ -51,11 +62,9 @@ zh-TW:
             skip_template: 略過
           edit:
             edit: 編輯
-            empty: 目前為止還沒有什麼問題
+            empty: 目前為止還沒有什麼問題.
             questionnaire: 問題調查
           form:
-            save: 儲存
-            template_title: 範本資訊
             title: 問卷範本 %{questionnaire_for}
           index:
             confirm_delete: 您是否確定要刪除本範本？
@@ -71,4 +80,5 @@ zh-TW:
           duplicate: "%{user_name} 複製了 %{resource_name} 問卷模板"
           update: "%{user_name} 更新了 %{resource_name} 問卷模板"
       template_types:
+        block_user: 封鎖使用者訊息
         questionnaires: 問題調查

data/db/migrate/20221006055954_add_field_values_and_target_to_decidim_templates.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class AddFieldValuesAndTargetToDecidimTemplates < ActiveRecord::Migration[6.0]
+  class Template < ApplicationRecord
+    self.table_name = :decidim_templates_templates
+  end
+
+  def change
+    add_column :decidim_templates_templates, :field_values, :json, default: {}
+    add_column :decidim_templates_templates, :target, :string
+
+    reversible do |direction|
+      direction.up do
+        # rubocop:disable Rails/SkipsModelValidations
+        Template.where(templatable_type: "Decidim::Forms::Questionnaire").update_all(target: "questionnaire")
+        Template.where(templatable_type: "Decidim::Organization").update_all(target: "user_block")
+        # rubocop:enable Rails/SkipsModelValidations
+      end
+    end
+  end
+end

data/db/seeds.rb

@@ -6,7 +6,7 @@ if !Rails.env.production? || ENV.fetch("SEED", nil)
   require "decidim/faker/localized"
 
   # Since we usually migrate and seed in the same process, make sure
-  # that we don't have invalid or cached information after a migration.
+  # that we do not have invalid or cached information after a migration.
   decidim_tables = ActiveRecord::Base.connection.tables.select do |table|
     table.starts_with?("decidim_")
   end
@@ -17,7 +17,7 @@ if !Rails.env.production? || ENV.fetch("SEED", nil)
   organization = Decidim::Organization.first
 
   questionnaire_template = Decidim::Templates::Template.create!(
-    organization: organization,
+    organization:,
     name: Decidim::Faker::Localized.sentence(word_count: 2),
     description: Decidim::Faker::Localized.paragraph
   )
@@ -35,7 +35,7 @@ if !Rails.env.production? || ENV.fetch("SEED", nil)
 
   %w(short_answer long_answer).each_with_index do |text_question_type, index|
     Decidim::Forms::Question.create!(
-      questionnaire: questionnaire,
+      questionnaire:,
       body: Decidim::Faker::Localized.paragraph,
       question_type: text_question_type,
       position: index
@@ -44,7 +44,7 @@ if !Rails.env.production? || ENV.fetch("SEED", nil)
 
   %w(single_option multiple_option).each_with_index do |multiple_choice_question_type, index|
     question = Decidim::Forms::Question.create!(
-      questionnaire: questionnaire,
+      questionnaire:,
       body: Decidim::Faker::Localized.paragraph,
       question_type: multiple_choice_question_type,
       position: index + 2
@@ -56,7 +56,7 @@ if !Rails.env.production? || ENV.fetch("SEED", nil)
 
     question.display_conditions.create!(
       condition_question: questionnaire.questions.find_by(position: question.position - 2),
-      question: question,
+      question:,
       condition_type: :answered,
       mandatory: true
     )
@@ -64,7 +64,7 @@ if !Rails.env.production? || ENV.fetch("SEED", nil)
 
   %w(matrix_single matrix_multiple).each do |matrix_question_type|
     question = Decidim::Forms::Question.create!(
-      questionnaire: questionnaire,
+      questionnaire:,
       body: Decidim::Faker::Localized.paragraph,
       question_type: matrix_question_type
     )

data/lib/decidim/templates/admin_engine.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "decidim/templates/menu"
+
 module Decidim
   module Templates
     # This is the engine that runs on the public interface of `Templates`.
@@ -10,6 +12,15 @@ module Decidim
       paths["lib/tasks"] = nil
 
       routes do
+        resources :proposal_answer_templates do
+          member do
+            post :copy
+          end
+          collection do
+            get :fetch
+          end
+        end
+
         ## Routes for Questionnaire Templates
         resources :questionnaire_templates do
           member do
@@ -24,38 +35,26 @@ module Decidim
             get :preview # To provide a preview for the template in the object creation view
           end
         end
+        resources :block_user_templates do
+          member do
+            post :copy
+          end
+          collection do
+            get :fetch
+          end
+        end
 
         get "/questionnaire_template/questionnaire/answer_options", to: "questionnaires#answer_options", as: "answer_options_template"
 
         root to: "questionnaire_templates#index"
       end
 
-      initializer "decidim_participatory_processes.admin_participatory_processes_menu" do
-        Decidim.menu :admin_template_types_menu do |menu|
-          template_types.each_pair do |name, url|
-            menu.add_item name, name, url,
-                          if: allowed_to?(:index, :templates),
-                          active: is_active_link?(url)
-          end
-        end
-      end
-
-      initializer "decidim_templates.admin_mount_routes" do
-        Decidim::Core::Engine.routes do
-          mount Decidim::Templates::AdminEngine, at: "/admin/templates", as: "decidim_admin_templates"
-        end
+      initializer "decidim_templates_admin.participatory_processes_menu" do
+        Decidim::Templates::Menu.register_admin_template_types_menu!
       end
 
-      initializer "decidim_templates.admin_menu" do
-        Decidim.menu :admin_menu do |menu|
-          menu.add_item :questionnaire_templates,
-                        I18n.t("menu.templates", scope: "decidim.admin", default: "Templates"),
-                        decidim_admin_templates.questionnaire_templates_path,
-                        icon_name: "document",
-                        position: 12,
-                        active: :inclusive,
-                        if: allowed_to?(:read, :templates)
-        end
+      initializer "decidim_templates_admin.menu" do
+        Decidim::Templates::Menu.register_admin_menu!
       end
 
       def load_seed

data/lib/decidim/templates/engine.rb

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

data/lib/decidim/templates/menu.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Templates
+    class Menu
+      def self.register_admin_template_types_menu!
+        Decidim.menu :admin_template_types_menu do |menu|
+          menu.add_item :questionnaires,
+                        I18n.t("template_types.questionnaires", scope: "decidim.templates"),
+                        decidim_admin_templates.questionnaire_templates_path,
+                        icon_name: "clipboard-line",
+                        if: allowed_to?(:index, :templates),
+                        active: (
+                          is_active_link?(decidim_admin_templates.questionnaire_templates_path) ||
+                            is_active_link?(decidim_admin_templates.root_path)
+                        ) && !is_active_link?(decidim_admin_templates.block_user_templates_path) &&
+                                !is_active_link?(decidim_admin_templates.proposal_answer_templates_path)
+
+          menu.add_item :user_reports,
+                        I18n.t("template_types.block_user", scope: "decidim.templates"),
+                        decidim_admin_templates.block_user_templates_path,
+                        icon_name: "user-forbid-line",
+                        if: allowed_to?(:index, :templates),
+                        active: is_active_link?(decidim_admin_templates.block_user_templates_path)
+
+          menu.add_item :proposal_answers,
+                        I18n.t("template_types.proposal_answer_templates", scope: "decidim.templates"),
+                        decidim_admin_templates.proposal_answer_templates_path,
+                        icon_name: "file-copy-line",
+                        if: allowed_to?(:index, :templates),
+                        active: is_active_link?(decidim_admin_templates.proposal_answer_templates_path)
+        end
+      end
+
+      def self.register_admin_menu!
+        Decidim.menu :admin_menu do |menu|
+          menu.add_item :questionnaire_templates,
+                        I18n.t("menu.templates", scope: "decidim.admin", default: "Templates"),
+                        decidim_admin_templates.questionnaire_templates_path,
+                        icon_name: "file-copy-line",
+                        position: 12,
+                        active: is_active_link?(decidim_admin_templates.root_path),
+                        if: allowed_to?(:read, :templates)
+        end
+      end
+    end
+  end
+end