decidim-assemblies 0.25.0.rc4 → 0.26.0.rc1

data/config/locales/sv.yml

@@ -59,9 +59,9 @@ sv:
         birthplace: Födelseort
         ceased_date: Slutade datum
         designation_date: Utnämningsdatum
-        designation_mode: Utnämningsläge
         full_name: Fullständigt namn
         gender: Kön
+        non_user_avatar: Profilbild
         position: Befattning
         user_id: Användare
       assembly_user_role:
@@ -182,6 +182,9 @@ sv:
         update:
           error: Det gick inte att uppdatera en administratör för gruppen.
           success: Administratören för gruppen har uppdaterats.
+      filters:
+        decidim_assemblies_type_id_eq:
+          label: Typ av grupp
       menu:
         assemblies: Grupper
         assemblies_settings: Inställningar
@@ -296,7 +299,10 @@ sv:
         assembly_members:
           form:
             existing_user: Befintlig deltagare
+            explanation: 'Vägledning för bild:'
+            image_guide: Helst en porträttbild utan text.
             non_user: Ej deltagande
+            non_user_avatar_help: Du bör få samtycke av personerna innan du publicerar dem som medlem.
             select_a_position: Välj en position
             select_user: Välj en deltagare
             user_type: Typ av deltagare

data/config/locales/tr-TR.yml

@@ -58,7 +58,6 @@ tr:
         birthplace: DogumYeri
         ceased_date: Bitiş tarihi
         designation_date: Atama tarihi
-        designation_mode: Atama modu
         full_name: Ad Soyad
         gender: Cinsiyet
         position: Pozisyon

data/config/locales/uk.yml

@@ -55,7 +55,6 @@ uk:
         birthplace: Місце народження
         ceased_date: Дата припинення повноважень
         designation_date: Дата надання повноважень
-        designation_mode: Різновид повноважень
         full_name: Повне ім'я
         gender: Стать
         position: Посада

data/config/locales/val-ES.yml

@@ -0,0 +1 @@
+val:

data/config/locales/zh-CN.yml

@@ -56,7 +56,6 @@ zh-CN:
         birthplace: 出生地点
         ceased_date: 缓存日期
         designation_date: 指定日期
-        designation_mode: 设计模式
         full_name: 全名
         gender: 两性平等
         position: 位置

data/db/migrate/20210907120249_remove_designation_mode_from_assembly_members.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RemoveDesignationModeFromAssemblyMembers < ActiveRecord::Migration[6.0]
+  def change
+    remove_column :decidim_assembly_members, :designation_mode, :string
+  end
+end

data/lib/decidim/api/assembly_member_type.rb

@@ -20,7 +20,6 @@ module Decidim
       # field :birthday, Decidim::Core::DateType, "Birthday date of the member" # non-public currently
       field :birthplace, GraphQL::Types::String, "Birthplace of the member", null: true
       field :designation_date, Decidim::Core::DateType, "Date of designation of the member", null: true
-      # field :designationMode, types.String, "Mode in which the member was designated", property: :designation_mode # non-public currently
       field :position_other, GraphQL::Types::String, "Custom position name", null: true
       field :ceased_date, Decidim::Core::DateType, "Date of cease for the member", null: true
     end

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/engine.rb

@@ -110,6 +110,10 @@ module Decidim
       initializer "decidim_assemblies.query_extensions" do
         Decidim::Api::QueryType.include Decidim::Assemblies::QueryExtensions
       end
+
+      initializer "decidim_assemblies.webpacker.assets_path" do
+        Decidim.register_assets_path File.expand_path("app/packs", root)
+      end
     end
   end
 end

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.0.rc4"
+      "0.26.0.rc1"
     end
   end
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: decidim-assemblies
 version: !ruby/object:Gem::Version
-  version: 0.25.0.rc4
+  version: 0.26.0.rc1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
 - Marc Riera Casals
 - Oriol Gual Oliva
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-20 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.0.rc4
+        version: 0.26.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0.rc4
+        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.0.rc4
+        version: 0.26.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0.rc4
+        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.0.rc4
+        version: 0.26.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0.rc4
+        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
@@ -261,6 +262,7 @@ files:
 - config/locales/ko-KR.yml
 - config/locales/ko.yml
 - config/locales/lb-LU.yml
+- config/locales/lb.yml
 - config/locales/lt-LT.yml
 - config/locales/lt.yml
 - config/locales/lv.yml
@@ -285,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
@@ -310,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
@@ -330,7 +334,7 @@ homepage: https://github.com/decidim/decidim
 licenses:
 - AGPL-3.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -345,8 +349,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Decidim assemblies module
 test_files: []