decidim-admin 0.24.2 → 0.25.0.rc3

data/config/locales/sv.yml

@@ -43,6 +43,7 @@ sv:
         default_locale: Förvalt språk och region
         description: Beskrivning
         enable_omnipresent_banner: Visa banner på alla sidor
+        enable_participatory_space_filters: Aktivera filter för dialoger
         facebook_handler: Facebook-hanterare
         favicon: Ikon
         force_authentication: Tvinga autentisering
@@ -157,7 +158,8 @@ sv:
         browse: Bläddra
         category:
           new: Ny kategori
-        export: Exportera
+        export: Exportera alla
+        export-selection: Exportera markering
         import: Importera
         manage: Hantera
         new: Ny %{name}
@@ -336,6 +338,12 @@ sv:
         show:
           view_more_logs: Visa fler loggar
           welcome: Välkommen till Decidims administratörspanel.
+      domain_whitelist:
+        form:
+          domain_too_short: Domänen är för kort
+        update:
+          error: Vitlistans uppdatering misslyckades
+          success: Domäns vitlista har uppdaterats
       exports:
         export_as: "%{name} som %{export_format}"
         formats:
@@ -348,6 +356,16 @@ sv:
         category_id_eq:
           label: Kategori
         filter_label: Filtrera
+        invitation_accepted_at_present:
+          label: Inbjudan accepterad
+          values:
+            'false': 'Nej'
+            'true': 'Ja'
+        last_sign_in_at_present:
+          label: Inloggad senast
+          values:
+            'false': 'Nej'
+            'true': 'Ja'
         moderations:
           reportable_type_string_eq:
             label: Typ
@@ -356,6 +374,17 @@ sv:
           values:
             'false': Gjord officiell
             'true': Ej gjord officiell
+        participatory_space_private_users:
+          user_invitation_accepted_at_not_null:
+            label: Inbjudan godtagen
+            values:
+              'false': Ej godkänd
+              'true': Godkänd
+          user_invitation_sent_at_not_null:
+            label: Inbjudan skickad
+            values:
+              'false': Ej skickad
+              'true': Skickad
         private_space_eq:
           label: Privat
           values:
@@ -373,12 +402,14 @@ sv:
           name_or_nickname_or_email_cont: Sök i %{collection} efter e-post, namn eller smeknamn.
           reported_id_string_or_reported_content_cont: Sök %{collection} efter anmälningsID eller innehåll.
           title_cont: Sök %{collection} efter titel.
+          user_name_or_user_email_cont: Sök %{collection} efter namn eller e-post.
         state_eq:
           label: Län
       forms:
         file_help:
           import:
             explanation: 'Vägledning för fil:'
+            message_1: CSV, JSON och Excel (.xlsx) filer stöds
             message_2: För CSV-filer måste separatorn mellan kolumner vara en semikolon (";")
       help_sections:
         error: Det gick inte att uppdatera hjälpavsnitten
@@ -430,7 +461,7 @@ sv:
           accepted_mime_types:
             csv: csv
             json: json
-            xls: xls
+            xlsx: xlsx
           actions:
             back: Tillbaka
           file_legend: Lägg till en fil som kommer importeras.
@@ -456,6 +487,7 @@ sv:
         areas: Områden
         configuration: Konfiguration
         dashboard: Kontrollpanel
+        external_domain_whitelist: Vitlista för externa domäner
         help_sections: Hjälpavsnitt
         homepage: Hemsida
         impersonations: Uppträd som
@@ -727,6 +759,17 @@ sv:
             layout_appearance_title: Redigera layoutens utseende
             preview: Förhandsgranska
           omnipresent_banner_appearance_title: Redigera banner på alla sidor
+      organization_external_domain_whitelist:
+        edit:
+          update: Uppdatera
+        external_domain:
+          down: Ner
+          external_domain: Externt domän
+          remove: Ta bort
+          up: Upp
+        form:
+          add: Lägg till i vitlistan
+          title: Vitlista för externa domäner
       organization_homepage:
         edit:
           active_content_blocks: Block med aktivt innehåll

data/config/locales/tr-TR.yml

@@ -24,7 +24,6 @@ tr:
       component:
         name: isim
         published_at: Yayınlandı
-        weight: Ağırlık
       id: İD
       newsletter:
         body: Vücut
@@ -100,12 +99,10 @@ tr:
         show_in_footer: Altbilgiyi göster
         slug: URL sümüklü böcek
         title: Başlık
-        weight: Ağırlık
       static_page_topic:
         description: Açıklama
         show_in_footer: Altbilgiyi göster
         title: Başlık
-        weight: Ağırlık
       user_group_csv_verification:
         file: Dosya
     errors:
@@ -135,7 +132,6 @@ tr:
       actions:
         add: Eklemek
         browse: Araştır
-        export: ihracat
         manage: yönetme
         new: Yeni %{name}
         per_page: Sayfa başına

data/config/locales/uk.yml

@@ -23,7 +23,6 @@ uk:
       component:
         name: Ім'я
         published_at: 'Оприлюднено:'
-        weight: Вага
       id: Псевдонім
       newsletter:
         body: Основний текст
@@ -94,7 +93,6 @@ uk:
       actions:
         add: Додати
         browse: Переглянути
-        export: Зберегти у вигляді файлу
         manage: Керувати
         new: Додати %{name}
         permissions: Права

data/config/locales/zh-CN.yml

@@ -24,7 +24,6 @@ zh-CN:
       component:
         name: 名称
         published_at: 发布于
-        weight: 权重
       id: ID
       newsletter:
         body: 正文内容
@@ -97,12 +96,10 @@ zh-CN:
         show_in_footer: 在页脚显示
         slug: URL 名称
         title: 标题
-        weight: 权重
       static_page_topic:
         description: 描述
         show_in_footer: 在页脚显示
         title: 标题
-        weight: 权重
       user_group_csv_verification:
         file: 文件
     errors:
@@ -132,7 +129,6 @@ zh-CN:
       actions:
         add: 添加
         browse: 浏览
-        export: 导出
         manage: 管理
         new: 新建 %{name}
         per_page: 每页

data/config/routes.rb

@@ -7,9 +7,11 @@ Decidim::Admin::Engine.routes.draw do
       resource :homepage, only: [:edit, :update], controller: "organization_homepage" do
         resources :content_blocks, only: [:edit, :update], controller: "organization_homepage_content_blocks"
       end
+      resource :external_domain_whitelist, only: [:edit, :update], controller: "organization_external_domain_whitelist"
 
       member do
         get :users
+        get :user_entities
       end
     end
 

data/lib/decidim/admin/engine.rb

@@ -6,11 +6,7 @@ require "active_support/all"
 require "devise"
 require "devise-i18n"
 require "decidim/core"
-require "jquery-rails"
-require "sassc-rails"
-require "foundation-rails"
 require "foundation_rails_helper"
-require "autoprefixer-rails"
 require "rectify"
 require "doorkeeper"
 require "doorkeeper-i18n"
@@ -28,151 +24,228 @@ module Decidim
         end
       end
 
-      initializer "decidim_admin.assets" do |app|
-        app.config.assets.precompile += %w(decidim_admin_manifest.js)
-      end
-
       initializer "decidim_admin.global_moderation_menu" do
         Decidim.menu :admin_global_moderation_menu do |menu|
-          menu.item I18n.t("actions.not_hidden", scope: "decidim.moderations"),
-                    decidim_admin.moderations_path,
-                    position: 1,
-                    active: params[:hidden].blank?
-
-          menu.item I18n.t("actions.hidden", scope: "decidim.moderations"),
-                    decidim_admin.moderations_path(hidden: true),
-                    position: 2,
-                    active: params[:hidden].present?
+          menu.add_item :moderations,
+                        I18n.t("actions.not_hidden", scope: "decidim.moderations"),
+                        decidim_admin.moderations_path,
+                        position: 1,
+                        active: params[:hidden].blank?
+
+          menu.add_item :hidden_moderations,
+                        I18n.t("actions.hidden", scope: "decidim.moderations"),
+                        decidim_admin.moderations_path(hidden: true),
+                        position: 2,
+                        active: params[:hidden].present?
+        end
+      end
+
+      initializer "decidim_admin.workflows_menu" do
+        Decidim.menu :workflows_menu do |menu|
+          Decidim::Verifications.admin_workflows.each do |manifest|
+            next unless current_organization.available_authorizations.include?(manifest.name.to_s)
+
+            workflow = Decidim::Verifications::Adapter.new(manifest)
+
+            menu.add_item manifest.name.to_s,
+                          workflow.fullname,
+                          workflow.admin_root_path,
+                          active: is_active_link?(workflow.admin_root_path)
+          end
+        end
+      end
+
+      initializer "decidim_admin.impersonate_menu" do
+        Decidim.menu :impersonate_menu do |menu|
+          menu.add_item :conflicts,
+                        I18n.t("title", scope: "decidim.admin.conflicts"),
+                        decidim_admin.conflicts_path,
+                        active: is_active_link?(decidim_admin.conflicts_path),
+                        if: allowed_to?(:index, :impersonatable_user)
+        end
+      end
+
+      initializer "decidim_admin.admin_user_menu" do
+        Decidim.menu :admin_user_menu do |menu|
+          menu.add_item :users,
+                        I18n.t("menu.admins", scope: "decidim.admin"), decidim_admin.users_path,
+                        active: is_active_link?(decidim_admin.users_path),
+                        if: allowed_to?(:read, :admin_user)
+          menu.add_item :user_groups,
+                        I18n.t("menu.user_groups", scope: "decidim.admin"), decidim_admin.user_groups_path,
+                        active: is_active_link?(decidim_admin.user_groups_path),
+                        if: current_organization.user_groups_enabled? && allowed_to?(:index, :user_group)
+          menu.add_item :officializations,
+                        I18n.t("menu.participants", scope: "decidim.admin"), decidim_admin.officializations_path,
+                        active: is_active_link?(decidim_admin.officializations_path),
+                        if: allowed_to?(:index, :officialization)
+          menu.add_item :impersonatable_users,
+                        I18n.t("menu.impersonations", scope: "decidim.admin"), decidim_admin.impersonatable_users_path,
+                        active: is_active_link?(decidim_admin.impersonatable_users_path),
+                        if: allowed_to?(:index, :impersonatable_user),
+                        submenu: { target_menu: :impersonate_menu }
+
+          menu.add_item :moderated_users,
+                        I18n.t("menu.reported_users", scope: "decidim.admin"), decidim_admin.moderated_users_path,
+                        active: is_active_link?(decidim_admin.moderated_users_path),
+                        if: allowed_to?(:index, :moderate_users)
+          menu.add_item :authorization_workflows,
+                        I18n.t("menu.authorization_workflows", scope: "decidim.admin"), decidim_admin.authorization_workflows_path,
+                        active: is_active_link?(decidim_admin.authorization_workflows_path),
+                        if: allowed_to?(:index, :authorization),
+                        submenu: { target_menu: :workflows_menu }
         end
       end
 
       initializer "decidim_admin.admin_settings_menu" do
         Decidim.menu :admin_settings_menu do |menu|
-          menu.item I18n.t("menu.configuration", scope: "decidim.admin"),
-                    decidim_admin.edit_organization_path,
-                    position: 1.0,
-                    if: allowed_to?(:update, :organization, organization: current_organization),
-                    active: is_active_link?(decidim_admin.edit_organization_path)
-
-          menu.item I18n.t("menu.appearance", scope: "decidim.admin"),
-                    decidim_admin.edit_organization_appearance_path,
-                    position: 1.1,
-                    if: allowed_to?(:update, :organization, organization: current_organization),
-                    active: is_active_link?(decidim_admin.edit_organization_appearance_path)
-
-          menu.item I18n.t("menu.homepage", scope: "decidim.admin"),
-                    decidim_admin.edit_organization_homepage_path,
-                    position: 1.2,
-                    if: allowed_to?(:update, :organization, organization: current_organization),
-                    active: is_active_link?(decidim_admin.edit_organization_homepage_path, %r{^/admin/organization/homepage})
-
-          menu.item I18n.t("menu.scopes", scope: "decidim.admin"),
-                    decidim_admin.scopes_path,
-                    position: 1.3,
-                    if: allowed_to?(:read, :scope),
-                    active: is_active_link?(decidim_admin.scopes_path)
-          menu.item I18n.t("menu.scope_types", scope: "decidim.admin"),
-                    decidim_admin.scope_types_path,
-                    position: 1.4,
-                    if: allowed_to?(:read, :scope_type),
-                    active: is_active_link?(decidim_admin.scope_types_path)
-          menu.item I18n.t("menu.areas", scope: "decidim.admin"),
-                    decidim_admin.areas_path,
-                    position: 1.5,
-                    if: allowed_to?(:read, :area),
-                    active: is_active_link?(decidim_admin.areas_path)
-
-          menu.item I18n.t("menu.area_types", scope: "decidim.admin"),
-                    decidim_admin.area_types_path,
-                    position: 1.6,
-                    if: allowed_to?(:read, :area_type),
-                    active: is_active_link?(decidim_admin.area_types_path)
-
-          menu.item I18n.t("menu.help_sections", scope: "decidim.admin"),
-                    decidim_admin.help_sections_path,
-                    position: 1.6,
-                    if: allowed_to?(:update, :help_sections),
-                    active: is_active_link?(decidim_admin.help_sections_path)
+          menu.add_item :edit_organization,
+                        I18n.t("menu.configuration", scope: "decidim.admin"),
+                        decidim_admin.edit_organization_path,
+                        position: 1.0,
+                        if: allowed_to?(:update, :organization, organization: current_organization),
+                        active: is_active_link?(decidim_admin.edit_organization_path)
+
+          menu.add_item :edit_organization_appearance,
+                        I18n.t("menu.appearance", scope: "decidim.admin"),
+                        decidim_admin.edit_organization_appearance_path,
+                        position: 1.1,
+                        if: allowed_to?(:update, :organization, organization: current_organization),
+                        active: is_active_link?(decidim_admin.edit_organization_appearance_path)
+
+          menu.add_item :edit_organization_homepage,
+                        I18n.t("menu.homepage", scope: "decidim.admin"),
+                        decidim_admin.edit_organization_homepage_path,
+                        position: 1.2,
+                        if: allowed_to?(:update, :organization, organization: current_organization),
+                        active: is_active_link?(decidim_admin.edit_organization_homepage_path, %r{^/admin/organization/homepage})
+
+          menu.add_item :scopes,
+                        I18n.t("menu.scopes", scope: "decidim.admin"),
+                        decidim_admin.scopes_path,
+                        position: 1.3,
+                        if: allowed_to?(:read, :scope),
+                        active: is_active_link?(decidim_admin.scopes_path)
+          menu.add_item :scope_types,
+                        I18n.t("menu.scope_types", scope: "decidim.admin"),
+                        decidim_admin.scope_types_path,
+                        position: 1.4,
+                        if: allowed_to?(:read, :scope_type),
+                        active: is_active_link?(decidim_admin.scope_types_path)
+          menu.add_item :areas,
+                        I18n.t("menu.areas", scope: "decidim.admin"),
+                        decidim_admin.areas_path,
+                        position: 1.5,
+                        if: allowed_to?(:read, :area),
+                        active: is_active_link?(decidim_admin.areas_path)
+
+          menu.add_item :area_types,
+                        I18n.t("menu.area_types", scope: "decidim.admin"),
+                        decidim_admin.area_types_path,
+                        position: 1.6,
+                        if: allowed_to?(:read, :area_type),
+                        active: is_active_link?(decidim_admin.area_types_path)
+
+          menu.add_item :help_sections,
+                        I18n.t("menu.help_sections", scope: "decidim.admin"),
+                        decidim_admin.help_sections_path,
+                        position: 1.6,
+                        if: allowed_to?(:update, :help_sections),
+                        active: is_active_link?(decidim_admin.help_sections_path)
+
+          menu.add_item :external_domain_whitelist,
+                        I18n.t("menu.external_domain_whitelist", scope: "decidim.admin"),
+                        decidim_admin.edit_organization_external_domain_whitelist_path,
+                        position: 1.7,
+                        if: allowed_to?(:update, :organization, organization: current_organization),
+                        active: is_active_link?(decidim_admin.edit_organization_external_domain_whitelist_path)
         end
       end
 
       initializer "decidim_admin.menu" do
         Decidim.menu :admin_menu do |menu|
-          menu.item I18n.t("menu.dashboard", scope: "decidim.admin"),
-                    decidim_admin.root_path,
-                    icon_name: "dashboard",
-                    position: 1,
-                    active: ["decidim/admin/dashboard" => :show]
-
-          menu.item I18n.t("menu.moderation", scope: "decidim.admin"),
-                    decidim_admin.moderations_path,
-                    icon_name: "flag",
-                    position: 4,
-                    active: [%w(
-                      decidim/admin/global_moderations
-                      decidim/admin/global_moderations/reports
-                    ), []],
-                    if: allowed_to?(:read, :global_moderation)
-
-          menu.item I18n.t("menu.static_pages", scope: "decidim.admin"),
-                    decidim_admin.static_pages_path,
-                    icon_name: "book",
-                    position: 4.5,
-                    active: [%w(
-                      decidim/admin/static_pages
-                      decidim/admin/static_page_topics
-                    ), []],
-                    if: allowed_to?(:read, :static_page)
-
-          menu.item I18n.t("menu.users", scope: "decidim.admin"),
-                    allowed_to?(:read, :admin_user) ? decidim_admin.users_path : decidim_admin.impersonatable_users_path,
-                    icon_name: "person",
-                    position: 5,
-                    active: [%w(
-                      decidim/admin/users
-                      decidim/admin/user_groups
-                      decidim/admin/user_groups_csv_verifications
-                      decidim/admin/officializations
-                      decidim/admin/impersonatable_users
-                      decidim/admin/moderated_users
-                      decidim/admin/managed_users/impersonation_logs
-                      decidim/admin/managed_users/promotions
-                      decidim/admin/authorization_workflows
-                    ), []],
-                    if: allowed_to?(:read, :admin_user) || allowed_to?(:read, :managed_user)
-
-          menu.item I18n.t("menu.newsletters", scope: "decidim.admin"),
-                    decidim_admin.newsletters_path,
-                    icon_name: "envelope-closed",
-                    position: 6,
-                    active: is_active_link?(decidim_admin.newsletters_path, :inclusive) ||
-                            is_active_link?(decidim_admin.newsletter_templates_path, :inclusive),
-                    if: allowed_to?(:index, :newsletter)
-
-          menu.item I18n.t("menu.settings", scope: "decidim.admin"),
-                    decidim_admin.edit_organization_path,
-                    icon_name: "wrench",
-                    position: 7,
-                    active: [
-                      %w(
-                        decidim/admin/organization
-                        decidim/admin/organization_appearance
-                        decidim/admin/organization_homepage
-                        decidim/admin/organization_homepage_content_blocks
-                        decidim/admin/scopes
-                        decidim/admin/scope_types
-                        decidim/admin/areas decidim/admin/area_types
-                      ),
-                      []
-                    ],
-                    if: allowed_to?(:update, :organization, organization: current_organization)
-
-          menu.item I18n.t("menu.admin_log", scope: "decidim.admin"),
-                    decidim_admin.logs_path,
-                    icon_name: "dashboard",
-                    position: 10,
-                    active: [%w(decidim/admin/logs), []],
-                    if: allowed_to?(:read, :admin_log)
+          menu.add_item :dashboard,
+                        I18n.t("menu.dashboard", scope: "decidim.admin"),
+                        decidim_admin.root_path,
+                        icon_name: "dashboard",
+                        position: 1,
+                        active: ["decidim/admin/dashboard" => :show]
+
+          menu.add_item :moderations,
+                        I18n.t("menu.moderation", scope: "decidim.admin"),
+                        decidim_admin.moderations_path,
+                        icon_name: "flag",
+                        position: 4,
+                        active: [%w(
+                          decidim/admin/global_moderations
+                          decidim/admin/global_moderations/reports
+                        ), []],
+                        if: allowed_to?(:read, :global_moderation)
+
+          menu.add_item :static_pages,
+                        I18n.t("menu.static_pages", scope: "decidim.admin"),
+                        decidim_admin.static_pages_path,
+                        icon_name: "book",
+                        position: 4.5,
+                        active: [%w(
+                          decidim/admin/static_pages
+                          decidim/admin/static_page_topics
+                        ), []],
+                        if: allowed_to?(:read, :static_page)
+
+          menu.add_item :impersonatable_users,
+                        I18n.t("menu.users", scope: "decidim.admin"),
+                        allowed_to?(:read, :admin_user) ? decidim_admin.users_path : decidim_admin.impersonatable_users_path,
+                        icon_name: "person",
+                        position: 5,
+                        active: [%w(
+                          decidim/admin/users
+                          decidim/admin/user_groups
+                          decidim/admin/user_groups_csv_verifications
+                          decidim/admin/officializations
+                          decidim/admin/impersonatable_users
+                          decidim/admin/moderated_users
+                          decidim/admin/managed_users/impersonation_logs
+                          decidim/admin/managed_users/promotions
+                          decidim/admin/authorization_workflows
+                        ), []],
+                        if: allowed_to?(:read, :admin_user) || allowed_to?(:read, :managed_user)
+
+          menu.add_item :newsletters,
+                        I18n.t("menu.newsletters", scope: "decidim.admin"),
+                        decidim_admin.newsletters_path,
+                        icon_name: "envelope-closed",
+                        position: 6,
+                        active: is_active_link?(decidim_admin.newsletters_path, :inclusive) ||
+                                is_active_link?(decidim_admin.newsletter_templates_path, :inclusive),
+                        if: allowed_to?(:index, :newsletter)
+
+          menu.add_item :edit_organization,
+                        I18n.t("menu.settings", scope: "decidim.admin"),
+                        decidim_admin.edit_organization_path,
+                        icon_name: "wrench",
+                        position: 7,
+                        active: [
+                          %w(
+                            decidim/admin/organization
+                            decidim/admin/organization_appearance
+                            decidim/admin/organization_homepage
+                            decidim/admin/organization_homepage_content_blocks
+                            decidim/admin/scopes
+                            decidim/admin/scope_types
+                            decidim/admin/areas decidim/admin/area_types
+                          ),
+                          []
+                        ],
+                        if: allowed_to?(:update, :organization, organization: current_organization)
+
+          menu.add_item :logs,
+                        I18n.t("menu.admin_log", scope: "decidim.admin"),
+                        decidim_admin.logs_path,
+                        icon_name: "dashboard",
+                        position: 10,
+                        active: [%w(decidim/admin/logs), []],
+                        if: allowed_to?(:read, :admin_log)
         end
       end