decidim-assemblies 0.25.2 → 0.26.0.rc1

data/lib/decidim/assemblies/admin_engine.rb

@@ -50,7 +50,9 @@ module Decidim
               get :share
             end
             resources :exports, only: :create
-            resources :imports, only: [:new, :create]
+            resources :imports, only: [:new, :create] do
+              get :example, on: :collection
+            end
           end
 
           resources :moderations do

data/lib/decidim/assemblies/participatory_space.rb

@@ -30,7 +30,7 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
 
   participatory_space.exports :assemblies do |export|
     export.collection do |assembly|
-      Decidim::Assembly.where(id: assembly.id)
+      Decidim::Assembly.where(id: assembly.id).includes(:area, :scope, :attachment_collections, :categories)
     end
 
     export.serializer Decidim::Assemblies::AssemblySerializer
@@ -248,7 +248,6 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
             birthday: Faker::Date.birthday(min_age: 18, max_age: 65),
             birthplace: Faker::Demographic.demonym,
             designation_date: Faker::Date.between(from: 1.year.ago, to: 1.month.ago),
-            designation_mode: Faker::Lorem.word,
             position: position,
             position_other: position == "other" ? Faker::Job.position : nil,
             assembly: current_assembly
@@ -261,7 +260,6 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
           birthday: Faker::Date.birthday(min_age: 18, max_age: 65),
           birthplace: Faker::Demographic.demonym,
           designation_date: Faker::Date.between(from: 1.year.ago, to: 1.month.ago),
-          designation_mode: Faker::Lorem.word,
           position: "other",
           position_other: Faker::Job.position,
           assembly: current_assembly

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

@@ -168,7 +168,6 @@ FactoryBot.define do
     birthplace { Faker::Lorem.word }
     position { Decidim::AssemblyMember::POSITIONS.first }
     designation_date { Faker::Date.between(from: 1.year.ago, to: 1.month.ago) }
-    designation_mode { Faker::Lorem.word }
 
     trait :ceased do
       ceased_date { Faker::Date.between(from: 1.day.ago, to: 5.days.ago) }

data/lib/decidim/assemblies/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-assemblies
 version: !ruby/object:Gem::Version
-  version: 0.25.2
+  version: 0.26.0.rc1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-25 00:00:00.000000000 Z
+date: 2022-01-24 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.25.2
+        version: 0.26.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.2
+        version: 0.26.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.2
+        version: 0.26.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.2
+        version: 0.26.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.2
+        version: 0.26.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.2
+        version: 0.26.0.rc1
 description: Assemblies component for decidim.
 email:
 - josepjaume@gmail.com
@@ -218,6 +218,7 @@ files:
 - app/views/layouts/decidim/_assembly_navigation.html.erb
 - app/views/layouts/decidim/admin/assemblies.html.erb
 - app/views/layouts/decidim/admin/assembly.html.erb
+- app/views/layouts/decidim/admin/assembly_members.html.erb
 - app/views/layouts/decidim/assembly.html.erb
 - config/assets.rb
 - config/locales/am-ET.yml
@@ -286,6 +287,7 @@ files:
 - config/locales/ti-ER.yml
 - config/locales/tr-TR.yml
 - config/locales/uk.yml
+- config/locales/val-ES.yml
 - config/locales/vi-VN.yml
 - config/locales/vi.yml
 - config/locales/zh-CN.yml
@@ -311,6 +313,7 @@ files:
 - db/migrate/20210204152393_add_weight_field_to_assembly.rb
 - db/migrate/20210310120444_add_followable_counter_cache_to_assemblies.rb
 - db/migrate/20210507063604_add_announcement_to_assemblies.rb
+- db/migrate/20210907120249_remove_designation_mode_from_assembly_members.rb
 - db/seeds/Exampledocument.pdf
 - db/seeds/city.jpeg
 - db/seeds/city2.jpeg
@@ -342,11 +345,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Decidim assemblies module