decidim-assemblies 0.24.1 → 0.25.0.rc2

data/config/locales/ro-RO.yml

@@ -52,7 +52,7 @@ ro:
         target: Cine participă
         title: Titlu
         twitter: Twitter
-        weight: Pondere
+        weight: Ordinea procesului
         youtube: YouTube
       assembly_member:
         birthday: Data nașterii
@@ -63,7 +63,7 @@ ro:
         full_name: Numele complet
         gender: Sexul
         position: Poziție
-        user_id: Utilizator
+        user_id: Utilizator sau grup
       assembly_user_role:
         email: E-mail
         name: Nume
@@ -265,6 +265,7 @@ ro:
       admin:
         assemblies:
           form:
+            announcement_help: Textul pe care îl introduceți aici va fi prezentat utilizatorului sub informațiile despre adunare.
             duration: Durată
             duration_help: În cazul în care durata acestei adunări este limitată, selectaţi data de încheiere. În caz contrar, va apărea ca indefinită.
             filters: Filtre
@@ -384,35 +385,11 @@ ro:
         social_networks: Rețele sociale
         social_networks_title: Distribuie această organizație pe
         target: Cine participă
-      statistics:
-        answers_count: Răspunsuri
-        assemblies_count: Organizații
-        comments_count: Comentarii
-        debates_count: Dezbateri
-        endorsements_count: Susținători
-        meetings_count: Întâlniri
-        orders_count: Suportă
-        pages_count: Pagini
-        participants_count: Participanți
-        posts_count: Mesaje
-        processes_count: Procese
-        projects_count: Proiecte
-        proposals_count: Propuneri
-        results_count: Rezultate
-        supports_count: Suportă
-        surveys_count: Chestionare
-        users_count: Participanți
-        votes_count: Suportă
     assembly_members:
       assembly_member:
         designated_on: Desemnat la
       index:
         title: Membri
-    conferences:
-      pages:
-        home:
-          highlighted_conferences:
-            conferences_button_title: Link către pagina de conferințe care afișează toate conferințele
     events:
       assemblies:
         create_assembly_member:
@@ -445,19 +422,11 @@ ro:
         description: Numărul de organizații create
         object: organizații
         title: Organizații
-    pages:
-      home:
-        hero:
-          participate_title: Participă la procesele platformei
-        sub_hero:
-          register_title: Înregistrează-te pentru a crea un cont
     participatory_processes:
-      pages:
-        home:
-          highlighted_processes:
-            processes_button_title: Link către pagina Proceselor care afișează toate procesele
       show:
         related_assemblies: Organizații asemănătoare
+    statistics:
+      assemblies_count: Organizații
   errors:
     messages:
       cannot_be_blank: nu poate fi necompletat

data/config/locales/ru.yml

@@ -305,23 +305,6 @@ ru:
         scope: Охват
         social_networks: Социальные сети
         target: Кто участвует
-      statistics:
-        answers_count: Ответов
-        assemblies_count: Собрания
-        comments_count: Комментариев
-        debates_count: Обсуждений
-        endorsements_count: Выражений поддержки
-        meetings_count: Встреч
-        orders_count: Голосов
-        pages_count: Страниц
-        participants_count: Участников
-        projects_count: Проектов
-        proposals_count: Предложений
-        results_count: Итогов
-        supports_count: Голосов
-        surveys_count: Опросов
-        users_count: Участников
-        votes_count: Голосов
     assembly_members:
       assembly_member:
         designated_on: 'Полномочия предоставлены:'

data/config/locales/sk.yml

@@ -143,13 +143,6 @@ sk:
             assemblies_button_title: Odkaz na stránku Zhromaždenia, zobrazujúcu všetky zhromaždenia
       show:
         social_networks_title: Zdieľať toto zhromaždenie na
-      statistics:
-        posts_count: Príspevky
-    conferences:
-      pages:
-        home:
-          highlighted_conferences:
-            conferences_button_title: Odkaz na stránku Konferencie, zobrazujúcu všetky konferencie
     events:
       assemblies:
         create_assembly_member:
@@ -158,12 +151,3 @@ sk:
       value_types:
         assembly_type_presenter:
           not_found: 'Typ zhromaždenia nebol nájdený v databáze (ID: %{id})'
-    pages:
-      home:
-        hero:
-          participate_title: Podieľajte sa na procesoch platformy
-    participatory_processes:
-      pages:
-        home:
-          highlighted_processes:
-            processes_button_title: Odkaz na stránku Procesy, zobrazujúcu všetky procesy

data/config/locales/sl.yml

@@ -233,23 +233,6 @@ sl:
         scope: Področje
         social_networks: Socialna omrežja
         target: Kdor je prisostoval
-      statistics:
-        answers_count: Odgovori
-        assemblies_count: Združbe
-        comments_count: Komentarji
-        debates_count: Debate
-        meetings_count: Sestanki
-        orders_count: Podpora
-        pages_count: Strani
-        participants_count: Udeleženci
-        posts_count: Objave
-        projects_count: Projekti
-        proposals_count: Predlogi
-        results_count: Rezultati
-        supports_count: Podpora
-        surveys_count: Ankete
-        users_count: Udeleženci
-        votes_count: Podpora
     help:
       participatory_spaces:
         assemblies:

data/config/locales/sr-CS.yml

@@ -35,13 +35,6 @@ sr:
             assemblies_button_title: Veza ka strani Veća koja prikazuje sva veća
       show:
         social_networks_title: Podelite ovo veće na
-      statistics:
-        posts_count: Objave
-    conferences:
-      pages:
-        home:
-          highlighted_conferences:
-            conferences_button_title: Veza ka strani Konferencije koja prikazuje sve konferencije
     events:
       assemblies:
         create_assembly_member:
@@ -59,12 +52,3 @@ sr:
       value_types:
         assembly_type_presenter:
           not_found: 'Ovaj tip veća nije pronađen u bazi podataka (ID: %{id})'
-    pages:
-      home:
-        hero:
-          participate_title: Učestvujte u procesima platforme
-    participatory_processes:
-      pages:
-        home:
-          highlighted_processes:
-            processes_button_title: Veza ka strani Procesi koja prikazuje sve procese

data/config/locales/sv.yml

@@ -262,6 +262,7 @@ sv:
       admin:
         assemblies:
           form:
+            announcement_help: Texten du skriver här visas för användaren direkt under gruppinformationen.
             duration: Varaktighet
             duration_help: Om varaktigheten för gruppen är begränsad, välj ett slutdatum. Annars kommer den att visas som permanent.
             filters: Filter
@@ -381,37 +382,11 @@ sv:
         social_networks: Sociala nätverk
         social_networks_title: Dela denna grupp på
         target: Vilka deltar
-      statistics:
-        answers_count: Svar
-        assemblies_count: Grupper
-        comments_count: Kommentarer
-        debates_count: Debatter
-        endorsements_count: Instämmanden
-        followers_count: Följare
-        headline: Statistik
-        meetings_count: Möten
-        orders_count: Stöd
-        pages_count: Sidor
-        participants_count: Deltagare
-        posts_count: Inlägg
-        processes_count: Dialoger
-        projects_count: Projekt
-        proposals_count: Förslag
-        results_count: Resultat
-        supports_count: Stöd
-        surveys_count: Undersökningar
-        users_count: Deltagare
-        votes_count: Stöd
     assembly_members:
       assembly_member:
         designated_on: Utsedd den
       index:
         title: Medlemmar
-    conferences:
-      pages:
-        home:
-          highlighted_conferences:
-            conferences_button_title: Länk till sidan över konferenser som visar alla konferenser
     events:
       assemblies:
         create_assembly_member:
@@ -444,19 +419,11 @@ sv:
         description: Antal skapade grupper
         object: grupper
         title: Grupper
-    pages:
-      home:
-        hero:
-          participate_title: Delta i plattformens dialoger
-        sub_hero:
-          register_title: Skapa ett konto
     participatory_processes:
-      pages:
-        home:
-          highlighted_processes:
-            processes_button_title: Länk till sidan som visar alla dialoger
       show:
         related_assemblies: Relaterade grupper
+    statistics:
+      assemblies_count: Grupper
   errors:
     messages:
       cannot_be_blank: kan inte vara tomt

data/config/locales/tr-TR.yml

@@ -379,34 +379,11 @@ tr:
         social_networks: Sosyal ağlar
         social_networks_title: Bu kurulu paylaş
         target: Katılanlar
-      statistics:
-        answers_count: Cevaplar
-        assemblies_count: Kurullar
-        comments_count: Yorumlar
-        debates_count: Tartışmalar
-        endorsements_count: Onaylar
-        meetings_count: Toplantılar
-        orders_count: Destekler
-        pages_count: Sayfalar
-        participants_count: Katılımcılar
-        posts_count: Yayınlar
-        projects_count: Projeler
-        proposals_count: Teklifler
-        results_count: Sonuçlar
-        supports_count: Destekler
-        surveys_count: Anketler
-        users_count: Katılımcılar
-        votes_count: Destekler
     assembly_members:
       assembly_member:
         designated_on: Üzerinde belirlenen
       index:
         title: Üyeler
-    conferences:
-      pages:
-        home:
-          highlighted_conferences:
-            conferences_button_title: Tüm konferansları görüntüleyen Konferanslar sayfasına bağlantı
     events:
       assemblies:
         create_assembly_member:
@@ -439,15 +416,7 @@ tr:
         description: Oluşturulan kurul sayısı
         object: kurullar
         title: Kurullar
-    pages:
-      home:
-        hero:
-          participate_title: Platformun süreçlerine katılın
     participatory_processes:
-      pages:
-        home:
-          highlighted_processes:
-            processes_button_title: Tüm süreçleri gösteren Süreçler sayfasına bağlantı
       show:
         related_assemblies: İlgili kurullar
   errors:

data/config/locales/uk.yml

@@ -305,23 +305,6 @@ uk:
         scope: Обсяг
         social_networks: Соціальні мережі
         target: Хто бере участь
-      statistics:
-        answers_count: Відповідей
-        assemblies_count: Збори
-        comments_count: Коментарів
-        debates_count: Обговорень
-        endorsements_count: Проявів підтримки
-        meetings_count: Зустрічей
-        orders_count: Голосів
-        pages_count: Сторінок
-        participants_count: Учасників
-        projects_count: Проектів
-        proposals_count: Пропозицій
-        results_count: Підсумків
-        supports_count: Голосів
-        surveys_count: Опитувань
-        users_count: Учасників
-        votes_count: Голосів
     assembly_members:
       assembly_member:
         designated_on: 'Надано повноваження:'

data/config/locales/zh-CN.yml

@@ -370,34 +370,11 @@ zh-CN:
         social_networks: 社交网络
         social_networks_title: 分享此程序集
         target: 谁参与
-      statistics:
-        answers_count: 答案
-        assemblies_count: 程序集
-        comments_count: 评论
-        debates_count: 辩论
-        endorsements_count: 授权
-        meetings_count: 会议
-        orders_count: 支持
-        pages_count: 页 次
-        participants_count: 参加者
-        posts_count: 员额
-        projects_count: 项目
-        proposals_count: 建议
-        results_count: 成果
-        supports_count: 支持
-        surveys_count: 调查
-        users_count: 参加者
-        votes_count: 支持
     assembly_members:
       assembly_member:
         designated_on: 指定于
       index:
         title: 成员
-    conferences:
-      pages:
-        home:
-          highlighted_conferences:
-            conferences_button_title: 链接到显示所有会议的会议页面
     events:
       assemblies:
         create_assembly_member:
@@ -430,15 +407,7 @@ zh-CN:
         description: 创建的集合数
         object: 程序集
         title: 程序集
-    pages:
-      home:
-        hero:
-          participate_title: 参与平台进程
     participatory_processes:
-      pages:
-        home:
-          highlighted_processes:
-            processes_button_title: 链接到显示所有进程的进程页面
       show:
         related_assemblies: 相关的会议
   errors:

data/db/migrate/20210507063604_add_announcement_to_assemblies.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddAnnouncementToAssemblies < ActiveRecord::Migration[6.0]
+  def change
+    add_column :decidim_assemblies, :announcement, :jsonb
+  end
+end

data/lib/decidim/api/assembly_type.rb

@@ -7,6 +7,7 @@ module Decidim
       implements Decidim::Core::ParticipatorySpaceInterface
       implements Decidim::Core::AttachableInterface
       implements Decidim::Core::ParticipatorySpaceResourceableInterface
+      implements Decidim::Core::CategoriesContainerInterface
 
       description "An assembly"
 
@@ -20,7 +21,6 @@ module Decidim
       field :updated_at, Decidim::Core::DateTimeType, "The time this assembly was updated", null: false
       field :published_at, Decidim::Core::DateTimeType, "The time this assembly was published", null: false
       field :reference, String, "Reference for this assembly", null: false
-      field :categories, [Decidim::Core::CategoryType, { null: true }], "Categories for this assembly", null: false
 
       field :hero_image, String, "The hero image for this assembly", null: true
       field :banner_image, String, "The banner image for this assembly", null: true
@@ -56,9 +56,18 @@ module Decidim
       field :facebook_handler, String, "Facebook handler", null: true
       field :youtube_handler, String, "Youtube handler", null: true
       field :github_handler, String, "Github handler", null: true
+      field :announcement, Decidim::Core::TranslatedFieldType, "Highlighted announcement for this assembly", null: true
 
       field :members, [Decidim::Assemblies::AssemblyMemberType, { null: true }], "Members of this assembly", null: false
       field :children, [Decidim::Assemblies::AssemblyType, { null: true }], "Childrens of this assembly", null: false
+
+      def hero_image
+        object.attached_uploader(:hero_image).path
+      end
+
+      def banner_image
+        object.attached_uploader(:banner_image).path
+      end
     end
   end
 end

data/lib/decidim/assemblies/admin_engine.rb

@@ -83,46 +83,138 @@ module Decidim
         end
       end
 
-      initializer "decidim_assemblies.action_controller" do |_app|
-        ActiveSupport.on_load :action_controller do
-          helper Decidim::Assemblies::Admin::AssembliesAdminMenuHelper if respond_to?(:helper)
+      initializer "decidim_assemblies.action_controller" do |app|
+        app.config.to_prepare do
+          ActiveSupport.on_load :action_controller do
+            helper Decidim::Assemblies::Admin::AssembliesAdminMenuHelper if respond_to?(:helper)
+          end
         end
       end
 
-      initializer "decidim_assemblies.admin_assets" do |app|
-        app.config.assets.precompile += %w(admin/decidim_assemblies_manifest.js)
-      end
-
       initializer "decidim_assemblies.admin_menu" do
         Decidim.menu :admin_menu do |menu|
-          menu.item I18n.t("menu.assemblies", scope: "decidim.admin"),
-                    decidim_admin_assemblies.assemblies_path,
-                    icon_name: "dial",
-                    position: 2.2,
-                    active: :inclusive,
-                    if: allowed_to?(:enter, :space_area, space_name: :assemblies)
+          menu.add_item :assemblies,
+                        I18n.t("menu.assemblies", scope: "decidim.admin"),
+                        decidim_admin_assemblies.assemblies_path,
+                        icon_name: "dial",
+                        position: 2.2,
+                        active: :inclusive,
+                        if: allowed_to?(:enter, :space_area, space_name: :assemblies)
+        end
+      end
+
+      initializer "decidim_assemblies.assemblies_admin_attachments_menu" do
+        Decidim.menu :assemblies_admin_attachments_menu do |menu|
+          menu.add_item :assembly_attachment_collections,
+                        I18n.t("attachment_collections", scope: "decidim.admin.menu.assemblies_submenu"),
+                        decidim_admin_assemblies.assembly_attachment_collections_path(current_participatory_space),
+                        active: is_active_link?(decidim_admin_assemblies.assembly_attachment_collections_path(current_participatory_space)),
+                        if: allowed_to?(:read, :attachment_collection, assembly: current_participatory_space)
+
+          menu.add_item :assembly_attachments,
+                        I18n.t("attachment_files", scope: "decidim.admin.menu.assemblies_submenu"),
+                        decidim_admin_assemblies.assembly_attachments_path(current_participatory_space),
+                        active: is_active_link?(decidim_admin_assemblies.assembly_attachments_path(current_participatory_space)),
+                        if: allowed_to?(:read, :attachment, assembly: current_participatory_space)
         end
       end
+      initializer "decidim_assemblies.admin_assemblies_components_menu" do
+        Decidim.menu :admin_assemblies_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)) ||
+                                  is_active_link?(decidim_admin_assemblies.edit_component_path(current_participatory_space, component)) ||
+                                  is_active_link?(decidim_admin_assemblies.edit_component_permissions_path(current_participatory_space, component)) ||
+                                  participatory_space_active_link?(component),
+                          if: component.manifest.admin_engine && user_role_config.component_is_accessible?(component.manifest_name)
+          end
+        end
+      end
+      initializer "decidim_assemblies.assemblies_admin_menu" do
+        Decidim.menu :admin_assembly_menu do |menu|
+          menu.add_item :edit_assembly,
+                        I18n.t("info", scope: "decidim.admin.menu.assemblies_submenu"),
+                        decidim_admin_assemblies.edit_assembly_path(current_participatory_space),
+                        position: 1,
+                        if: allowed_to?(:update, :assembly, assembly: current_participatory_space),
+                        active: is_active_link?(decidim_admin_assemblies.edit_assembly_path(current_participatory_space))
+
+          menu.add_item :components,
+                        I18n.t("components", scope: "decidim.admin.menu.assemblies_submenu"),
+                        decidim_admin_assemblies.components_path(current_participatory_space),
+                        active: is_active_link?(decidim_admin_assemblies.components_path(current_participatory_space)),
+                        if: allowed_to?(:read, :component, assembly: current_participatory_space),
+                        submenu: { target_menu: :admin_assemblies_components_menu, options: { container_options: { id: "components-list" } } }
+
+          menu.add_item :categories,
+                        I18n.t("categories", scope: "decidim.admin.menu.assemblies_submenu"),
+                        decidim_admin_assemblies.categories_path(current_participatory_space),
+                        if: allowed_to?(:read, :category, assembly: current_participatory_space),
+                        active: is_active_link?(decidim_admin_assemblies.categories_path(current_participatory_space))
+
+          menu.add_item :attachments,
+                        I18n.t("attachments", scope: "decidim.admin.menu.assemblies_submenu"),
+                        "#",
+                        active: is_active_link?(decidim_admin_assemblies.assembly_attachment_collections_path(current_participatory_space)) ||
+                                is_active_link?(decidim_admin_assemblies.assembly_attachments_path(current_participatory_space)),
+                        if: allowed_to?(:read, :attachment_collection, assembly: current_participatory_space) ||
+                            allowed_to?(:read, :attachment, assembly: current_participatory_space),
+                        submenu: { target_menu: :assemblies_admin_attachments_menu }
+
+          menu.add_item :assembly_members,
+                        I18n.t("assembly_members", scope: "decidim.admin.menu.assemblies_submenu"),
+                        decidim_admin_assemblies.assembly_members_path(current_participatory_space),
+                        if: allowed_to?(:read, :assembly_member, assembly: current_participatory_space),
+                        active: is_active_link?(decidim_admin_assemblies.assembly_members_path(current_participatory_space))
+
+          menu.add_item :assembly_user_roles,
+                        I18n.t("assembly_admins", scope: "decidim.admin.menu.assemblies_submenu"),
+                        decidim_admin_assemblies.assembly_user_roles_path(current_participatory_space),
+                        if: allowed_to?(:read, :assembly_user_role, assembly: current_participatory_space),
+                        active: is_active_link?(decidim_admin_assemblies.assembly_user_roles_path(current_participatory_space))
+
+          menu.add_item :participatory_space_private_users,
+                        I18n.t("private_users", scope: "decidim.admin.menu.assemblies_submenu"),
+                        decidim_admin_assemblies.participatory_space_private_users_path(current_participatory_space),
+                        if: allowed_to?(:read, :space_private_user, assembly: current_participatory_space),
+                        active: is_active_link?(decidim_admin_assemblies.participatory_space_private_users_path(current_participatory_space))
+
+          menu.add_item :moderations,
+                        I18n.t("moderations", scope: "decidim.admin.menu.assemblies_submenu"),
+                        decidim_admin_assemblies.moderations_path(current_participatory_space),
+                        if: allowed_to?(:read, :moderation, assembly: current_participatory_space),
+                        active: is_active_link?(decidim_admin_assemblies.moderations_path(current_participatory_space))
+        end
+      end
       initializer "decidim_assemblies.admin_assemblies_menu" do
         Decidim.menu :admin_assemblies_menu do |menu|
-          menu.item I18n.t("menu.assemblies", scope: "decidim.admin"),
-                    decidim_admin_assemblies.assemblies_path,
-                    position: 1.0,
-                    active: is_active_link?(decidim_admin_assemblies.assemblies_path),
-                    if: allowed_to?(:read, :assembly_list)
-
-          menu.item I18n.t("menu.assemblies_types", scope: "decidim.admin"),
-                    decidim_admin_assemblies.assemblies_types_path,
-                    active: is_active_link?(decidim_admin_assemblies.assemblies_types_path),
-                    position: 1.1,
-                    if: allowed_to?(:manage, :assemblies_type)
-
-          menu.item I18n.t("menu.assemblies_settings", scope: "decidim.admin"),
-                    decidim_admin_assemblies.edit_assemblies_settings_path,
-                    active: is_active_link?(decidim_admin_assemblies.edit_assemblies_settings_path),
-                    position: 1.3,
-                    if: allowed_to?(:read, :assemblies_setting)
+          menu.add_item :assemblies,
+                        I18n.t("menu.assemblies", scope: "decidim.admin"),
+                        decidim_admin_assemblies.assemblies_path,
+                        position: 1.0,
+                        active: is_active_link?(decidim_admin_assemblies.assemblies_path),
+                        if: allowed_to?(:read, :assembly_list)
+
+          menu.add_item :assemblies_types,
+                        I18n.t("menu.assemblies_types", scope: "decidim.admin"),
+                        decidim_admin_assemblies.assemblies_types_path,
+                        active: is_active_link?(decidim_admin_assemblies.assemblies_types_path),
+                        position: 1.1,
+                        if: allowed_to?(:manage, :assemblies_type)
+
+          menu.add_item :edit_assemblies_settings,
+                        I18n.t("menu.assemblies_settings", scope: "decidim.admin"),
+                        decidim_admin_assemblies.edit_assemblies_settings_path,
+                        active: is_active_link?(decidim_admin_assemblies.edit_assemblies_settings_path),
+                        position: 1.3,
+                        if: allowed_to?(:read, :assemblies_setting)
         end
       end
     end