decidim-assemblies 0.21.0 → 0.23.2

data/config/locales/zh-TW.yml

@@ -0,0 +1 @@
+zh-TW:

data/db/migrate/20200320105906_index_foreign_keys_in_decidim_assemblies.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class IndexForeignKeysInDecidimAssemblies < ActiveRecord::Migration[5.2]
+  def change
+    add_index :decidim_assemblies, :decidim_scope_id
+  end
+end

data/db/migrate/20200320105907_index_foreign_keys_in_decidim_assembly_user_roles.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class IndexForeignKeysInDecidimAssemblyUserRoles < ActiveRecord::Migration[5.2]
+  def change
+    add_index :decidim_assembly_user_roles, :decidim_user_id
+  end
+end

data/db/migrate/20200416132109_remove_legacy_decidim_assembly_type.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class RemoveLegacyDecidimAssemblyType < ActiveRecord::Migration[5.2]
+  def change
+    remove_column :decidim_assemblies, :assembly_type, :string
+    remove_column :decidim_assemblies, :assembly_type_other, :jsonb
+  end
+end

data/db/migrate/20200430202456_create_decidim_assemblies_settings.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class CreateDecidimAssembliesSettings < ActiveRecord::Migration[5.2]
+  def change
+    create_table :decidim_assemblies_settings do |t|
+      t.boolean :enable_organization_chart, default: true
+      t.references :decidim_organization, foreign_key: true
+    end
+  end
+end

data/lib/decidim/assemblies/admin_engine.rb

@@ -16,6 +16,7 @@ module Decidim
 
       routes do
         resources :assemblies_types
+        resource :assemblies_settings, only: [:edit, :update], controller: "assemblies_settings"
 
         resources :assemblies, param: :slug, except: [:show, :destroy] do
           resource :publish, controller: "assembly_publications", only: [:create, :destroy]
@@ -30,6 +31,12 @@ module Decidim
 
           resources :attachment_collections, controller: "assembly_attachment_collections"
           resources :attachments, controller: "assembly_attachments"
+
+          resource :export, controller: "assembly_exports", only: :create
+
+          collection do
+            resources :imports, controller: "assembly_imports", only: [:new, :create]
+          end
         end
 
         scope "/assemblies/:assembly_slug" do
@@ -40,6 +47,7 @@ module Decidim
             member do
               put :publish
               put :unpublish
+              get :share
             end
             resources :exports, only: :create
           end

data/lib/decidim/assemblies/engine.rb

@@ -25,7 +25,7 @@ module Decidim
 
         resources :assemblies, only: [:index, :show], param: :slug, path: "assemblies" do
           resources :assembly_members, only: :index, path: "members"
-          resource :assembly_widget, only: :show, path: "embed"
+          resource :widget, only: :show, path: "embed"
         end
 
         scope "/assemblies/:assembly_slug/f/:component_id" do

data/lib/decidim/assemblies/participatory_space.rb

@@ -28,6 +28,19 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
     context.layout = "layouts/decidim/admin/assembly"
   end
 
+  participatory_space.exports :assemblies do |export|
+    export.collection do |assembly|
+      Decidim::Assembly.where(id: assembly.id)
+    end
+
+    export.serializer Decidim::Assemblies::AssemblySerializer
+  end
+
+  participatory_space.register_on_destroy_account do |user|
+    Decidim::AssemblyUserRole.where(user: user).destroy_all
+    Decidim::AssemblyMember.where(user: user).destroy_all
+  end
+
   participatory_space.seeds do
     organization = Decidim::Organization.first
     seeds_root = File.join(__dir__, "..", "..", "..", "db", "seeds")
@@ -35,7 +48,7 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
     Decidim::ContentBlock.create(
       organization: organization,
       weight: 32,
-      scope: :homepage,
+      scope_name: :homepage,
       manifest_name: :highlighted_assemblies,
       published_at: Time.current
     )
@@ -52,11 +65,11 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
         description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
           Decidim::Faker::Localized.paragraph(3)
         end,
-        hero_image: File.new(File.join(seeds_root, "city.jpeg")),
-        banner_image: File.new(File.join(seeds_root, "city2.jpeg")),
+        organization: organization,
+        hero_image: File.new(File.join(seeds_root, "city.jpeg")), # Keep after organization
+        banner_image: File.new(File.join(seeds_root, "city2.jpeg")), # Keep after organization
         promoted: true,
         published_at: 2.weeks.ago,
-        organization: organization,
         meta_scope: Decidim::Faker::Localized.word,
         developer_group: Decidim::Faker::Localized.sentence(1),
         local_area: Decidim::Faker::Localized.sentence(2),
@@ -135,11 +148,11 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
         description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
           Decidim::Faker::Localized.paragraph(3)
         end,
-        hero_image: File.new(File.join(seeds_root, "city.jpeg")),
-        banner_image: File.new(File.join(seeds_root, "city2.jpeg")),
+        organization: organization,
+        hero_image: File.new(File.join(seeds_root, "city.jpeg")), # Keep after organization
+        banner_image: File.new(File.join(seeds_root, "city2.jpeg")), # Keep after organization
         promoted: true,
         published_at: 2.weeks.ago,
-        organization: organization,
         meta_scope: Decidim::Faker::Localized.word,
         developer_group: Decidim::Faker::Localized.sentence(1),
         local_area: Decidim::Faker::Localized.sentence(2),
@@ -161,23 +174,23 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
         Decidim::Attachment.create!(
           title: Decidim::Faker::Localized.sentence(2),
           description: Decidim::Faker::Localized.sentence(5),
-          file: File.new(File.join(seeds_root, "Exampledocument.pdf")),
           attachment_collection: attachment_collection,
-          attached_to: current_assembly
+          attached_to: current_assembly,
+          file: File.new(File.join(seeds_root, "Exampledocument.pdf")) # Keep after attached_to
         )
 
         Decidim::Attachment.create!(
           title: Decidim::Faker::Localized.sentence(2),
           description: Decidim::Faker::Localized.sentence(5),
-          file: File.new(File.join(seeds_root, "city.jpeg")),
-          attached_to: current_assembly
+          attached_to: current_assembly,
+          file: File.new(File.join(seeds_root, "city.jpeg")) # Keep after attached_to
         )
 
         Decidim::Attachment.create!(
           title: Decidim::Faker::Localized.sentence(2),
           description: Decidim::Faker::Localized.sentence(5),
-          file: File.new(File.join(seeds_root, "Exampledocument.pdf")),
-          attached_to: current_assembly
+          attached_to: current_assembly,
+          file: File.new(File.join(seeds_root, "Exampledocument.pdf")) # Keep after attached_to
         )
 
         2.times do

data/lib/decidim/assemblies/test/factories.rb

@@ -8,6 +8,11 @@ FactoryBot.define do
     "#{Faker::Internet.slug(nil, "-")}-#{n}"
   end
 
+  factory :assemblies_setting, class: "Decidim::AssembliesSetting" do
+    enable_organization_chart { true }
+    organization
+  end
+
   factory :assemblies_type, class: "Decidim::AssembliesType" do
     title { generate_localized_title }
     organization
@@ -19,10 +24,10 @@ FactoryBot.define do
     subtitle { generate_localized_title }
     short_description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
-    hero_image { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
-    banner_image { Decidim::Dev.test_file("city2.jpeg", "image/jpeg") }
-    published_at { Time.current }
     organization
+    hero_image { Decidim::Dev.test_file("city.jpeg", "image/jpeg") } # Keep after organization
+    banner_image { Decidim::Dev.test_file("city2.jpeg", "image/jpeg") } # Keep after organization
+    published_at { Time.current }
     meta_scope { Decidim::Faker::Localized.word }
     developer_group { generate_localized_title }
     local_area { generate_localized_title }

data/lib/decidim/assemblies/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-assemblies version.
   module Assemblies
     def self.version
-      "0.21.0"
+      "0.23.2"
     end
   end
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: decidim-assemblies
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.23.2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
 - Marc Riera Casals
 - Oriol Gual Oliva
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-08 00:00:00.000000000 Z
+date: 2021-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,42 +18,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.23.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.23.2
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.23.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.23.2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.23.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.23.2
 description: Assemblies component for decidim.
 email:
 - josepjaume@gmail.com
@@ -71,6 +71,7 @@ files:
 - app/assets/javascripts/decidim/assemblies/admin/assemblies.js.es6
 - app/assets/javascripts/decidim/assemblies/admin/assembly_members.js.es6
 - app/assets/javascripts/decidim/assemblies/assemblies.js.es6
+- app/assets/javascripts/decidim/assemblies/orgchart.js.es6
 - app/cells/decidim/assemblies/assembly_cell.rb
 - app/cells/decidim/assemblies/assembly_m/footer.erb
 - app/cells/decidim/assemblies/assembly_m/tags.erb
@@ -90,8 +91,11 @@ files:
 - app/commands/decidim/assemblies/admin/destroy_assemblies_type.rb
 - app/commands/decidim/assemblies/admin/destroy_assembly_admin.rb
 - app/commands/decidim/assemblies/admin/destroy_assembly_member.rb
+- app/commands/decidim/assemblies/admin/import_assembly.rb
+- app/commands/decidim/assemblies/admin/notify_role_assigned_to_assembly.rb
 - app/commands/decidim/assemblies/admin/publish_assembly.rb
 - app/commands/decidim/assemblies/admin/unpublish_assembly.rb
+- app/commands/decidim/assemblies/admin/update_assemblies_setting.rb
 - app/commands/decidim/assemblies/admin/update_assemblies_type.rb
 - app/commands/decidim/assemblies/admin/update_assembly.rb
 - app/commands/decidim/assemblies/admin/update_assembly_admin.rb
@@ -102,10 +106,13 @@ files:
 - app/controllers/concerns/decidim/assemblies/admin/filterable.rb
 - app/controllers/decidim/assemblies/admin/application_controller.rb
 - app/controllers/decidim/assemblies/admin/assemblies_controller.rb
+- app/controllers/decidim/assemblies/admin/assemblies_settings_controller.rb
 - app/controllers/decidim/assemblies/admin/assemblies_types_controller.rb
 - app/controllers/decidim/assemblies/admin/assembly_attachment_collections_controller.rb
 - app/controllers/decidim/assemblies/admin/assembly_attachments_controller.rb
 - app/controllers/decidim/assemblies/admin/assembly_copies_controller.rb
+- app/controllers/decidim/assemblies/admin/assembly_exports_controller.rb
+- app/controllers/decidim/assemblies/admin/assembly_imports_controller.rb
 - app/controllers/decidim/assemblies/admin/assembly_members_controller.rb
 - app/controllers/decidim/assemblies/admin/assembly_publications_controller.rb
 - app/controllers/decidim/assemblies/admin/assembly_user_roles_controller.rb
@@ -120,27 +127,34 @@ files:
 - app/controllers/decidim/assemblies/application_controller.rb
 - app/controllers/decidim/assemblies/assemblies_controller.rb
 - app/controllers/decidim/assemblies/assembly_members_controller.rb
-- app/controllers/decidim/assemblies/assembly_widgets_controller.rb
+- app/controllers/decidim/assemblies/widgets_controller.rb
+- app/events/decidim/assemblies/create_assembly_member_event.rb
+- app/events/decidim/role_assigned_to_assembly_event.rb
+- app/forms/decidim/assemblies/admin/assemblies_setting_form.rb
 - app/forms/decidim/assemblies/admin/assemblies_type_form.rb
 - app/forms/decidim/assemblies/admin/assembly_copy_form.rb
 - app/forms/decidim/assemblies/admin/assembly_form.rb
+- app/forms/decidim/assemblies/admin/assembly_import_form.rb
 - app/forms/decidim/assemblies/admin/assembly_member_form.rb
 - app/forms/decidim/assemblies/admin/assembly_user_role_form.rb
 - app/helpers/decidim/assemblies/admin/assemblies_helper.rb
 - app/helpers/decidim/assemblies/assemblies_helper.rb
 - app/helpers/decidim/assemblies/filter_assemblies_helper.rb
+- app/models/decidim/assemblies_setting.rb
 - app/models/decidim/assemblies_type.rb
 - app/models/decidim/assembly.rb
 - app/models/decidim/assembly_member.rb
 - app/models/decidim/assembly_user_role.rb
 - app/permissions/decidim/assemblies/permissions.rb
 - app/presenters/decidim/admin/assembly_member_presenter.rb
+- app/presenters/decidim/assemblies/admin_log/assemblies_setting_presenter.rb
 - app/presenters/decidim/assemblies/admin_log/assemblies_type_presenter.rb
 - app/presenters/decidim/assemblies/admin_log/assembly_member_presenter.rb
 - app/presenters/decidim/assemblies/admin_log/assembly_presenter.rb
 - app/presenters/decidim/assemblies/admin_log/assembly_user_role_presenter.rb
 - app/presenters/decidim/assemblies/admin_log/value_types/member_position_presenter.rb
 - app/presenters/decidim/assemblies/admin_log/value_types/role_presenter.rb
+- app/presenters/decidim/assemblies/assembly_presenter.rb
 - app/presenters/decidim/assemblies/assembly_stats_presenter.rb
 - app/presenters/decidim/assembly_member_presenter.rb
 - app/presenters/decidim/assembly_presenter.rb
@@ -160,6 +174,8 @@ files:
 - app/queries/decidim/assemblies/promoted_assemblies.rb
 - app/queries/decidim/assemblies/published_assemblies.rb
 - app/queries/decidim/assemblies/visible_assemblies.rb
+- app/serializers/decidim/assemblies/assembly_importer.rb
+- app/serializers/decidim/assemblies/assembly_serializer.rb
 - app/services/decidim/assemblies/assembly_search.rb
 - app/types/decidim/assemblies/assemblies_type_type.rb
 - app/types/decidim/assemblies/assembly_member_type.rb
@@ -170,12 +186,16 @@ files:
 - app/views/decidim/assemblies/admin/assemblies/edit.html.erb
 - app/views/decidim/assemblies/admin/assemblies/index.html.erb
 - app/views/decidim/assemblies/admin/assemblies/new.html.erb
+- app/views/decidim/assemblies/admin/assemblies_settings/_form.html.erb
+- app/views/decidim/assemblies/admin/assemblies_settings/edit.html.erb
 - app/views/decidim/assemblies/admin/assemblies_types/_form.html.erb
 - app/views/decidim/assemblies/admin/assemblies_types/edit.html.erb
 - app/views/decidim/assemblies/admin/assemblies_types/index.html.erb
 - app/views/decidim/assemblies/admin/assemblies_types/new.html.erb
 - app/views/decidim/assemblies/admin/assembly_copies/_form.html.erb
 - app/views/decidim/assemblies/admin/assembly_copies/new.html.erb
+- app/views/decidim/assemblies/admin/assembly_imports/_form.html.erb
+- app/views/decidim/assemblies/admin/assembly_imports/new.html.erb
 - app/views/decidim/assemblies/admin/assembly_members/_form.html.erb
 - app/views/decidim/assemblies/admin/assembly_members/edit.html.erb
 - app/views/decidim/assemblies/admin/assembly_members/index.html.erb
@@ -200,38 +220,74 @@ files:
 - app/views/layouts/decidim/admin/assemblies.html.erb
 - app/views/layouts/decidim/admin/assembly.html.erb
 - app/views/layouts/decidim/assembly.html.erb
+- config/locales/am-ET.yml
 - config/locales/ar-SA.yml
 - config/locales/ar.yml
+- config/locales/bg-BG.yml
+- config/locales/bg.yml
 - config/locales/ca.yml
 - config/locales/cs-CZ.yml
 - config/locales/cs.yml
+- config/locales/da-DK.yml
+- config/locales/da.yml
 - config/locales/de.yml
 - config/locales/el-GR.yml
 - config/locales/el.yml
 - config/locales/en.yml
 - config/locales/eo-UY.yml
+- config/locales/eo.yml
 - config/locales/es-MX.yml
 - config/locales/es-PY.yml
 - config/locales/es.yml
+- config/locales/et-EE.yml
+- config/locales/et.yml
 - config/locales/eu.yml
 - config/locales/fi-pl.yml
 - config/locales/fi-plain.yml
 - config/locales/fi.yml
+- config/locales/fr-CA.yml
 - config/locales/fr.yml
+- config/locales/ga-IE.yml
 - config/locales/gl.yml
+- config/locales/hr-HR.yml
+- config/locales/hr.yml
 - config/locales/hu.yml
 - config/locales/id-ID.yml
 - config/locales/is-IS.yml
+- config/locales/is.yml
 - config/locales/it.yml
+- config/locales/ja-JP.yml
+- config/locales/ja.yml
+- config/locales/ko-KR.yml
+- config/locales/ko.yml
+- config/locales/lt-LT.yml
+- config/locales/lt.yml
+- config/locales/lv.yml
+- config/locales/mt-MT.yml
+- config/locales/mt.yml
 - config/locales/nl.yml
 - config/locales/no.yml
+- config/locales/om-ET.yml
 - config/locales/pl.yml
 - config/locales/pt-BR.yml
 - config/locales/pt.yml
+- config/locales/ro-RO.yml
 - config/locales/ru.yml
+- config/locales/si-LK.yml
+- config/locales/sk-SK.yml
+- config/locales/sk.yml
+- config/locales/sl.yml
+- config/locales/so-SO.yml
+- config/locales/sr-CS.yml
 - config/locales/sv.yml
+- config/locales/sw-KE.yml
+- config/locales/ti-ER.yml
 - config/locales/tr-TR.yml
 - config/locales/uk.yml
+- config/locales/vi-VN.yml
+- config/locales/vi.yml
+- config/locales/zh-CN.yml
+- config/locales/zh-TW.yml
 - db/migrate/20170727190859_add_assemblies.rb
 - db/migrate/20170822153055_add_scopes_enabled_to_assemblies.rb
 - db/migrate/20180109105917_add_assembly_user_roles.rb
@@ -246,6 +302,10 @@ files:
 - db/migrate/20190215093700_reset_negative_children_count_counters.rb
 - db/migrate/20200108113855_create_decidim_assembly_types.rb
 - db/migrate/20200108123050_migrate_decidim_assembly_types.rb
+- db/migrate/20200320105906_index_foreign_keys_in_decidim_assemblies.rb
+- db/migrate/20200320105907_index_foreign_keys_in_decidim_assembly_user_roles.rb
+- db/migrate/20200416132109_remove_legacy_decidim_assembly_type.rb
+- db/migrate/20200430202456_create_decidim_assemblies_settings.rb
 - db/seeds/Exampledocument.pdf
 - db/seeds/city.jpeg
 - db/seeds/city2.jpeg
@@ -262,7 +322,7 @@ homepage: https://github.com/decidim/decidim
 licenses:
 - AGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -270,15 +330,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Decidim assemblies module
 test_files: []