decidim-initiatives 0.24.3 → 0.25.0.rc1

data/config/locales/pt.yml

@@ -68,6 +68,8 @@ pt:
         search_placeholder:
           title_or_description_or_id_string_or_author_name_or_author_nickname_cont: Pesquisar %{collection} por título, descrição, ID ou nome do autor.
       menu:
+        components: Componentes
+        information: Informação
         initiatives: Iniciativas
         initiatives_types: Tipos de iniciativa
       models:
@@ -461,11 +463,6 @@ pt:
           vote: Assinar
   layouts:
     decidim:
-      admin:
-        initiative:
-          committee_members: Membros do Comité
-          components: Componentes
-          information: Informação
       initiative_creation_header:
         back: Retroceder
         fill_data: Criar

data/config/locales/ro-RO.yml

@@ -88,8 +88,13 @@ ro:
         search_placeholder:
           title_or_description_or_id_string_or_author_name_or_author_nickname_cont: Căutați în %{collection} după titlu, descriere, ID sau numele autorului.
       menu:
+        attachments: Atașamente
+        committee_members: Membrii Comitetului
+        components: Componente
+        information: Informare
         initiatives: Inițiative
         initiatives_types: Tipuri de inițiative
+        moderations: Moderări
       models:
         initiatives:
           fields:
@@ -394,6 +399,17 @@ ro:
           email_outro: Ați primit această notificare deoarece urmăriți %{author_nickname}. Puteți înceta să primiți notificări urmând linkul anterior.
           email_subject: Inițiativă aprobată de %{author_nickname}
           notification_title: Inițiativa <a href="%{resource_path}">%{resource_title}</a> a fost aprobată de <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
+        revoke_membership_request:
+          email_intro: "%{author_nickname} a respins cererea dvs. pentru a face parte din comitetul promotorilor pentru inițiativa următoare %{resource_title}."
+          email_outro: 'Ați primit această notificare deoarece ați aplicat la această inițiativă: %{resource_title}.'
+          email_subject: "%{author_nickname} a respins cererea ta la comitetul promotorilor"
+        spawn_committee_request_event:
+          email_intro: "%{applicant_nickname} a aplicat pentru comitetul promotor al inițiativei dumneavoastră %{resource_title}. Pentru a accepta sau respinge cererea, accesați forma de editare a inițiativei dvs."
+          email_outro: 'Ați primit această notificare deoarece sunteți autorul acestei inițiative: %{resource_title}'
+      form:
+        add_attachments: Documente
+        attachment_legend: "(Opțional) Adăugați atașamente"
+        delete_attachment: Șterge
       index:
         title: Inițiative
       initiative_signatures:
@@ -431,6 +447,12 @@ ro:
             one: și încă o persoană
             few: și încă %{count} persoane
             other: și încă %{count} persoane
+        committee_members:
+          approve: Aprobă
+          confirm_revoke: Ești sigur?
+          invite_to_committee_help: Distribuie acest link pentru a invita alți participanți la comitetul promotorilor
+          no_members_yet: Nu există membri în comitetul promotorilor
+          title: Membrii comitetului
         count:
           title:
             one: "Inițiativă %{count}"
@@ -471,11 +493,31 @@ ro:
           recent: Cele mai recente
           recently_published: Cel mai recent publicat
         print:
+          address: Adresă
+          author_title: Autorul inițiativei
           city: Localitate
+          email: Email
+          full_name: Numele complet
+          initiative:
+            attachments: Documentație atașată (vă rugăm să scrieți numele fiecărui document mai jos)
+            description: 'Descriere:'
+            title: 'Titlu:'
+            type: Tipul de inițiativă
+          phone_number: Număr de telefon
+          place_date: Locul, data
+          postal_code: Cod poștal/ZIP
+          print: Tipărește
+          province: Județ/stat
+          signature: Semnătură
         result:
+          answer_title: S-a răspuns la această inițiativă
           initiative_rejected_reason: Această inițiativă a fost respinsă din cauza lipsei de semnături.
         show:
+          any_vote_method: Această inițiativă adună semnături online și personale.
+          edit: Editează
           follow_description: Primiți o notificare atunci când există știri în această inițiativă
+          print: Imprimare inițiativă
+          send_to_technical_validation: Trimite la validarea tehnică
         signatures_count:
           one: " semnătură"
           few: " semnături"
@@ -523,6 +565,9 @@ ro:
         accepted: Acceptat
         expired: Expirat
       unavailable_scope: Domeniul de aplicare indisponibil
+      update:
+        error: A apărut o eroare
+        success: Inițiativa a fost actualizată
       versions:
         shared:
           back_to_resource: Întoarce-te la inițiativă
@@ -535,12 +580,6 @@ ro:
           vote: Semnare
   layouts:
     decidim:
-      admin:
-        initiative:
-          attachments: Atașamente
-          committee_members: Membrii Comitetului
-          components: Componente
-          information: Informare
       initiative_creation_header:
         back: Înapoi
         fill_data: Crează

data/config/locales/ru.yml

@@ -46,6 +46,8 @@ ru:
       actions:
         new_initiative_type: Добавить вид почина
       menu:
+        components: Составляющие
+        information: Сведения
         initiatives: Почины
         initiatives_types: Виды починов
       models:
@@ -304,11 +306,6 @@ ru:
       initiatives: Почины
   layouts:
     decidim:
-      admin:
-        initiative:
-          committee_members: Члены рабочей группы
-          components: Составляющие
-          information: Сведения
       initiative_creation_header:
         fill_data: Создать
         finish: Закончить

data/config/locales/sk.yml

@@ -60,6 +60,8 @@ sk:
       actions:
         new_initiative_type: Nový typ iniciatívy
       menu:
+        components: Komponenty
+        information: Informácie
         initiatives: Iniciatívy
         initiatives_types: Typy iniciatív
       models:
@@ -393,11 +395,6 @@ sk:
           vote: Hlasovanie
   layouts:
     decidim:
-      admin:
-        initiative:
-          committee_members: členovia komisie
-          components: Komponenty
-          information: Informácie
       initiative_creation_header:
         back: Späť
         fill_data: Vytvoriť

data/config/locales/sv.yml

@@ -82,8 +82,12 @@ sv:
         search_placeholder:
           title_or_description_or_id_string_or_author_name_or_author_nickname_cont: Sök %{collection} med titel, beskrivning, ID eller författarnamn.
       menu:
+        attachments: Bilagor
+        components: Komponenter
+        information: Information
         initiatives: Initiativ
         initiatives_types: Initiativtyper
+        moderations: Moderering
       models:
         initiatives:
           fields:
@@ -533,12 +537,6 @@ sv:
           vote: Underteckna
   layouts:
     decidim:
-      admin:
-        initiative:
-          attachments: Bilagor
-          committee_members: Kommittémedlemmar
-          components: Komponenter
-          information: Information
       initiative_creation_header:
         back: Tillbaka
         fill_data: Skapa

data/config/locales/tr-TR.yml

@@ -85,6 +85,8 @@ tr:
         search_placeholder:
           title_or_description_or_id_string_or_author_name_or_author_nickname_cont: '%{collection} ''ı başlık, açıklama, kimlik veya yazar adına göre arayın.'
       menu:
+        components: Bileşenler
+        information: Bilgi
         initiatives: Girişimler
         initiatives_types: Girişim türleri
       models:
@@ -554,12 +556,6 @@ tr:
           vote: İmza
   layouts:
     decidim:
-      admin:
-        initiative:
-          attachments: Ekli Dosyalar
-          committee_members: Komite üyeleri
-          components: Bileşenler
-          information: Bilgi
       initiative_creation_header:
         back: Geri
         fill_data: Oluştur

data/config/locales/uk.yml

@@ -46,6 +46,8 @@ uk:
       actions:
         new_initiative_type: Додати різновид почину
       menu:
+        components: Складові
+        information: Відомості
         initiatives: Почини
         initiatives_types: Різновиди починів
       models:
@@ -304,11 +306,6 @@ uk:
       initiatives: Почини
   layouts:
     decidim:
-      admin:
-        initiative:
-          committee_members: Члени робочого гурту
-          components: Складові
-          information: Відомості
       initiative_creation_header:
         fill_data: Внести
         finish: Завершити

data/config/locales/zh-CN.yml

@@ -82,6 +82,8 @@ zh-CN:
         search_placeholder:
           title_or_description_or_id_string_or_author_name_or_author_nickname_cont: 按标题、描述、ID或作者名称搜索 %{collection}。
       menu:
+        components: 组件
+        information: 信息
         initiatives: 倡议
         initiatives_types: 倡议类型
       models:
@@ -479,12 +481,6 @@ zh-CN:
           vote: 签名
   layouts:
     decidim:
-      admin:
-        initiative:
-          attachments: 附件
-          committee_members: 委员会成员
-          components: 组件
-          information: 信息
       initiative_creation_header:
         back: 后退
         fill_data: 创建

data/db/migrate/20191002082220_move_signature_type_to_initative_type.rb

@@ -22,7 +22,7 @@ class MoveSignatureTypeToInitativeType < ActiveRecord::Migration[5.2]
 
     InitiativesType.reset_column_information
 
-    Decidim::Initiatives::InitiativesType.find_each do |type|
+    InitiativesType.find_each do |type|
       type.signature_type = if type.online_signature_enabled && face_to_face_voting_allowed
                               :any
                             elsif type.online_signature_enabled && !face_to_face_voting_allowed

data/lib/decidim/api/initiative_api_type.rb

@@ -21,6 +21,10 @@ module Decidim
       field :signature_type, GraphQL::Types::String, "Signature type of the initiative", null: true
 
       field :initiatives, [Decidim::Initiatives::InitiativeType, { null: true }], "The initiatives that have this type", null: false
+
+      def banner_image
+        object.attached_uploader(:banner_image).path
+      end
     end
   end
 end

data/lib/decidim/initiatives/admin_engine.rb

@@ -44,6 +44,8 @@ module Decidim
             end
           end
 
+          resource :permissions, controller: "initiatives_permissions"
+
           resource :answer, only: [:edit, :update]
         end
 
@@ -79,41 +81,84 @@ module Decidim
         end
       end
 
-      initializer "admin_decidim_initiatives.assets" do |app|
-        app.config.assets.precompile += %w(
-          admin_decidim_initiatives_manifest.js
-        )
+      initializer "decidim_initiaves.admin_menu" do
+        Decidim.menu :admin_menu do |menu|
+          menu.add_item :initiatives,
+                        I18n.t("menu.initiatives", scope: "decidim.admin"),
+                        decidim_admin_initiatives.initiatives_path,
+                        icon_name: "chat",
+                        position: 2.4,
+                        active: :inclusive,
+                        if: allowed_to?(:enter, :space_area, space_name: :initiatives)
+        end
       end
 
-      initializer "admin_decidim_initiatives.action_controller" do |_app|
-        ActiveSupport.on_load :action_controller do
-          helper Decidim::Initiatives::Admin::InitiativeAdminMenuHelper if respond_to?(:helper)
+      initializer "admin_decidim_initiatives.admin_components_menu" do
+        Decidim.menu :admin_initiatives_components_menu do |menu|
+          current_participatory_space.components.each do |component|
+            caption = translated_attribute(component.name)
+            if component.primary_stat.present?
+              caption += content_tag(:span, component.primary_stat, class: component.primary_stat.zero? ? "component-counter component-counter--off" : "component-counter")
+            end
+
+            menu.add_item [component.manifest_name, component.id].join("_"),
+                          caption.html_safe,
+                          manage_component_path(component),
+                          active: is_active_link?(manage_component_path(component)),
+                          if: component.manifest.admin_engine # && user_role_config.component_is_accessible?(component.manifest_name)
+          end
         end
       end
 
-      initializer "decidim_initiaves.admin_menu" do
-        Decidim.menu :admin_menu do |menu|
-          menu.item I18n.t("menu.initiatives", scope: "decidim.admin"),
-                    decidim_admin_initiatives.initiatives_path,
-                    icon_name: "chat",
-                    position: 2.4,
-                    active: :inclusive,
-                    if: allowed_to?(:enter, :space_area, space_name: :initiatives)
+      initializer "admin_decidim_initiative.admin_menu" do
+        Decidim.menu :admin_initiative_menu do |menu|
+          menu.add_item :edit_initiative,
+                        I18n.t("menu.information", scope: "decidim.admin"),
+                        decidim_admin_initiatives.edit_initiative_path(current_participatory_space),
+                        active: is_active_link?(decidim_admin_initiatives.edit_initiative_path(current_participatory_space)),
+                        if: allowed_to?(:edit, :initiative, initiative: current_participatory_space)
+
+          menu.add_item :initiative_committee_requests,
+                        I18n.t("menu.committee_members", scope: "decidim.admin"),
+                        decidim_admin_initiatives.initiative_committee_requests_path(current_participatory_space),
+                        active: is_active_link?(decidim_admin_initiatives.initiative_committee_requests_path(current_participatory_space)),
+                        if: current_participatory_space.promoting_committee_enabled? && allowed_to?(:manage_membership, :initiative, initiative: current_participatory_space)
+
+          menu.add_item :components,
+                        I18n.t("menu.components", scope: "decidim.admin"),
+                        decidim_admin_initiatives.components_path(current_participatory_space),
+                        active: is_active_link?(decidim_admin_initiatives.components_path(current_participatory_space)),
+                        if: allowed_to?(:read, :component, initiative: current_participatory_space),
+                        submenu: { target_menu: :admin_initiatives_components_menu, options: { container_options: { id: "components-list" } } }
+
+          menu.add_item :initiative_attachments,
+                        I18n.t("menu.attachments", scope: "decidim.admin"),
+                        decidim_admin_initiatives.initiative_attachments_path(current_participatory_space),
+                        active: is_active_link?(decidim_admin_initiatives.initiative_attachments_path(current_participatory_space)),
+                        if: allowed_to?(:read, :attachment, initiative: current_participatory_space)
+
+          menu.add_item :moderations,
+                        I18n.t("menu.moderations", scope: "decidim.admin"),
+                        decidim_admin_initiatives.moderations_path(current_participatory_space),
+                        active: is_active_link?(decidim_admin_initiatives.moderations_path(current_participatory_space)),
+                        if: allowed_to?(:read, :moderation)
         end
       end
 
       initializer "admin_decidim_initiatives.admin_menu" do
         Decidim.menu :admin_initiatives_menu do |menu|
-          menu.item I18n.t("menu.initiatives", scope: "decidim.admin"),
-                    decidim_admin_initiatives.initiatives_path,
-                    position: 1.0,
-                    active: is_active_link?(decidim_admin_initiatives.initiatives_path),
-                    if: allowed_to?(:index, :initiative)
-
-          menu.item I18n.t("menu.initiatives_types", scope: "decidim.admin"),
-                    decidim_admin_initiatives.initiatives_types_path,
-                    active: is_active_link?(decidim_admin_initiatives.initiatives_types_path),
-                    if: allowed_to?(:manage, :initiative_type)
+          menu.add_item :initiatives,
+                        I18n.t("menu.initiatives", scope: "decidim.admin"),
+                        decidim_admin_initiatives.initiatives_path,
+                        position: 1.0,
+                        active: is_active_link?(decidim_admin_initiatives.initiatives_path),
+                        if: allowed_to?(:index, :initiative)
+
+          menu.add_item :initiatives_types,
+                        I18n.t("menu.initiatives_types", scope: "decidim.admin"),
+                        decidim_admin_initiatives.initiatives_types_path,
+                        active: is_active_link?(decidim_admin_initiatives.initiatives_types_path),
+                        if: allowed_to?(:manage, :initiative_type)
         end
       end
     end

data/lib/decidim/initiatives/engine.rb

@@ -65,13 +65,6 @@ module Decidim
         end
       end
 
-      initializer "decidim_initiatives.assets" do |app|
-        app.config.assets.precompile += %w(
-          decidim_initiatives_manifest.js
-          decidim_initiatives_manifest.css
-        )
-      end
-
       initializer "decidim_initiatives.content_blocks" do
         Decidim.content_blocks.register(:homepage, :highlighted_initiatives) do |content_block|
           content_block.cell = "decidim/initiatives/content_blocks/highlighted_initiatives"
@@ -92,10 +85,11 @@ module Decidim
 
       initializer "decidim_initiatives.menu" do
         Decidim.menu :menu do |menu|
-          menu.item I18n.t("menu.initiatives", scope: "decidim"),
-                    decidim_initiatives.initiatives_path,
-                    position: 2.4,
-                    active: :inclusive
+          menu.add_item :initiatives,
+                        I18n.t("menu.initiatives", scope: "decidim"),
+                        decidim_initiatives.initiatives_path,
+                        position: 2.4,
+                        active: :inclusive
         end
       end
 

data/lib/decidim/initiatives/participatory_space.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Decidim.register_participatory_space(:initiatives) do |participatory_space|
-  participatory_space.icon = "decidim/initiatives/icon.svg"
+  participatory_space.icon = "media/images/decidim_initiatives.svg"
   participatory_space.stylesheet = "decidim/initiatives/initiatives"
 
   participatory_space.context(:public) do |context|
@@ -21,6 +21,8 @@ Decidim.register_participatory_space(:initiatives) do |participatory_space|
   participatory_space.query_type = "Decidim::Initiatives::InitiativeType"
 
   participatory_space.register_resource(:initiative) do |resource|
+    resource.actions = %w(comment)
+    resource.permissions_class_name = "Decidim::Initiatives::Permissions"
     resource.model_class_name = "Decidim::Initiative"
     resource.card = "decidim/initiatives/initiative"
     resource.searchable = true
@@ -59,7 +61,12 @@ Decidim.register_participatory_space(:initiatives) do |participatory_space|
         title: Decidim::Faker::Localized.sentence(word_count: 5),
         description: Decidim::Faker::Localized.sentence(word_count: 25),
         organization: organization,
-        banner_image: File.new(File.join(seeds_root, "city2.jpeg"))
+        banner_image: ActiveStorage::Blob.create_after_upload!(
+          io: File.open(File.join(seeds_root, "city2.jpeg")),
+          filename: "banner_image.jpeg",
+          content_type: "image/jpeg",
+          metadata: nil
+        )
       )
 
       organization.top_scopes.each do |scope|
@@ -104,7 +111,13 @@ Decidim.register_participatory_space(:initiatives) do |participatory_space|
         title: Decidim::Faker::Localized.sentence(word_count: 2),
         description: Decidim::Faker::Localized.sentence(word_count: 5),
         attached_to: initiative,
-        file: File.new(File.join(seeds_root, "city.jpeg"))
+        content_type: "image/jpeg",
+        file: ActiveStorage::Blob.create_after_upload!(
+          io: File.open(File.join(seeds_root, "city.jpeg")),
+          filename: "city.jpeg",
+          content_type: "image/jpeg",
+          metadata: nil
+        )
       )
 
       Decidim::Initiatives.default_components.each do |component_name|