decidim-assemblies 0.9.3 → 0.10.0

data/config/locales/pt-BR.yml

@@ -2,9 +2,12 @@ pt-BR:
   activemodel:
     attributes:
       assembly:
+        area_id: Área
         banner_image: Imagem da bandeira
         copy_categories: Cópiar categorias
         copy_features: Recursos de cópia
+        decidim_area_id: Área
+        decidim_scope_id: Escopo
         description: Descrição
         developer_group: Grupo de desenvolvedores
         domain: Domínio
@@ -15,9 +18,11 @@ pt-BR:
         participatory_scope: Âmbito participativo
         participatory_structure: Estrutura participativa
         promoted: Destacado
+        published_at: Publicado em
         scope_id: Âmbito
         scopes_enabled: Âmbitos ativados
         short_description: Pequena descrição
+        show_statistics: Mostre estatisticas
         slug: Slug de URL
         subtitle: Subtítulo
         target: Alvo
@@ -80,6 +85,8 @@ pt-BR:
         assemblies: Assembléias
         assemblies_submenu:
           assembly_admins: Usuários da assembléia
+          attachment_collections: Coleções
+          attachment_files: arquivos
           attachments: Anexos
           categories: Categorias
           features: Características
@@ -105,10 +112,21 @@ pt-BR:
             moderator: Moderador
       titles:
         assemblies: Assembléias
+    admin_log:
+      assembly:
+        create: "%{user_name} criou o conjunto %{resource_name}"
+        publish: "%{user_name} publicou o conjunto %{resource_name}"
+        unpublish: "%{user_name} não publicado o conjunto %{resource_name}"
+        update: "%{user_name} atualizou a montagem %{resource_name}"
+      assembly_user_role:
+        create: "%{user_name} convidou %{resource_name} para o assembly %{space_name}"
+        delete: "%{user_name} removeu o usuário %{resource_name} do conjunto %{space_name}"
+        update: "%{user_name} alterou a função de %{resource_name} na montagem %{space_name}"
     assemblies:
       admin:
         assemblies:
           form:
+            select_an_area: Selecione uma Área
             slug_help: 'Os slugs de URL são usados ​​para gerar os URLs que apontam para essa assembléia. Apenas aceita letras, números e traços, e deve começar com uma carta. Exemplo: %{url}'
         assembly_copies:
           form:
@@ -121,6 +139,7 @@ pt-BR:
             active_assemblies: Conjuntos ativos
             see_all_assemblies: Veja todas as assembléias
       show:
+        area: Área
         developer_group: Grupo de desenvolvedores
         local_area: Área Local
         participatory_scope: Âmbito participativo
@@ -131,6 +150,7 @@ pt-BR:
         answers_count: Respostas
         assemblies_count: Assembléias
         comments_count: Comentários
+        endorsements_count: Endossos
         headline: Atividade
         meetings_count: Reuniões
         orders_count: Votos

data/config/locales/pt.yml

@@ -2,9 +2,12 @@ pt:
   activemodel:
     attributes:
       assembly:
+        area_id: Área
         banner_image: Imagem da bandeira
         copy_categories: Cópiar categorias
         copy_features: Recursos de cópia
+        decidim_area_id: Área
+        decidim_scope_id: Escopo
         description: Descrição
         developer_group: Grupo de desenvolvedores
         domain: Domínio
@@ -15,9 +18,11 @@ pt:
         participatory_scope: Âmbito participativo
         participatory_structure: Estrutura participativa
         promoted: Destacado
+        published_at: Publicado em
         scope_id: Âmbito
         scopes_enabled: Âmbitos ativados
         short_description: Pequena descrição
+        show_statistics: Mostre estatisticas
         slug: Slug de URL
         subtitle: Subtítulo
         target: Alvo
@@ -80,6 +85,8 @@ pt:
         assemblies: Assembléias
         assemblies_submenu:
           assembly_admins: Usuários da assembléia
+          attachment_collections: Coleções
+          attachment_files: arquivos
           attachments: Anexos
           categories: Categorias
           features: Características
@@ -105,10 +112,21 @@ pt:
             moderator: Moderador
       titles:
         assemblies: Assembléias
+    admin_log:
+      assembly:
+        create: "%{user_name} criou o conjunto %{resource_name}"
+        publish: "%{user_name} publicou o conjunto %{resource_name}"
+        unpublish: "%{user_name} não publicado o conjunto %{resource_name}"
+        update: "%{user_name} atualizou a montagem %{resource_name}"
+      assembly_user_role:
+        create: "%{user_name} convidou %{resource_name} para o assembly %{space_name}"
+        delete: "%{user_name} removeu o usuário %{resource_name} do conjunto %{space_name}"
+        update: "%{user_name} alterou a função de %{resource_name} na montagem %{space_name}"
     assemblies:
       admin:
         assemblies:
           form:
+            select_an_area: Selecione uma Área
             slug_help: 'Os slugs de URL são usados ​​para gerar os URLs que apontam para essa assembléia. Apenas aceita letras, números e traços, e deve começar com uma carta. Exemplo: %{url}'
         assembly_copies:
           form:
@@ -121,6 +139,7 @@ pt:
             active_assemblies: Conjuntos ativos
             see_all_assemblies: Veja todas as assembléias
       show:
+        area: Área
         developer_group: Grupo de desenvolvedores
         local_area: Área Local
         participatory_scope: Âmbito participativo
@@ -131,6 +150,7 @@ pt:
         answers_count: Respostas
         assemblies_count: Assembléias
         comments_count: Comentários
+        endorsements_count: Endossos
         headline: Atividade
         meetings_count: Reuniões
         orders_count: Votos

data/config/locales/sv.yml

@@ -2,9 +2,12 @@ sv:
   activemodel:
     attributes:
       assembly:
+        area_id: Område
         banner_image: Banner image
         copy_categories: Kopiera kategorier
         copy_features: Kopiera funktioner
+        decidim_area_id: Område
+        decidim_scope_id: Omfattning
         description: Beskrivning
         developer_group: Utvecklargrupp
         domain: Domän
@@ -15,9 +18,11 @@ sv:
         participatory_scope: Deltagande räckvidd
         participatory_structure: Deltagande struktur
         promoted: främjas
+        published_at: Publicerad på
         scope_id: Omfattning
         scopes_enabled: Scopes aktiverade
         short_description: Kort beskrivning
+        show_statistics: Visa statistik
         slug: URL slug
         subtitle: Texta
         target: Mål
@@ -80,6 +85,8 @@ sv:
         assemblies: Assemblies
         assemblies_submenu:
           assembly_admins: Monteringsanvändare
+          attachment_collections: samlingar
+          attachment_files: filer
           attachments: bilagor
           categories: kategorier
           features: Funktioner
@@ -105,10 +112,21 @@ sv:
             moderator: moderator
       titles:
         assemblies: Assemblies
+    admin_log:
+      assembly:
+        create: "%{user_name} skapade %{resource_name} -enheten"
+        publish: "%{user_name} publicerade %{resource_name} -enheten"
+        unpublish: "%{user_name} upublicerade %{resource_name} -enheten"
+        update: "%{user_name} uppdaterade %{resource_name} -enheten"
+      assembly_user_role:
+        create: "%{user_name} inbjudna %{resource_name} till sammansättningen %{space_name}"
+        delete: "%{user_name} tog bort användaren %{resource_name} från enheten %{space_name}"
+        update: "%{user_name} ändrade rollen som %{resource_name} i sammansättningen %{space_name}"
     assemblies:
       admin:
         assemblies:
           form:
+            select_an_area: Välj ett område
             slug_help: 'URL-slitsar används för att generera de webbadresser som pekar på den här enheten. Accepterar bara bokstäver, siffror och bindestreck, och måste börja med ett brev. Exempel: %{url}'
         assembly_copies:
           form:
@@ -121,6 +139,7 @@ sv:
             active_assemblies: Aktiva aggregat
             see_all_assemblies: Se alla församlingar
       show:
+        area: Område
         developer_group: Utvecklargrupp
         local_area: Lokalt område
         participatory_scope: Deltagande räckvidd
@@ -131,6 +150,7 @@ sv:
         answers_count: svar
         assemblies_count: Assemblies
         comments_count: kommentarer
+        endorsements_count: påskrifter
         headline: Aktivitet
         meetings_count: möten
         orders_count: röster

data/config/locales/uk.yml

@@ -10,7 +10,7 @@ uk:
         domain: Домен
         hashtag: Хештег
         hero_image: Зображення головної сторінки
-        local_area: Місцевість
+        local_area: Терен
         meta_scope: Метадані терену
         participatory_scope: Терен співучасті
         participatory_structure: Структура співучасті
@@ -21,7 +21,7 @@ uk:
         slug: Скорочена URL-адреса
         subtitle: Підзаголовок
         target: Мета
-        title: Назва
+        title: Заголовок
   decidim:
     admin:
       assemblies:
@@ -59,9 +59,21 @@ uk:
         destroy:
           error: При скасуванні публікації цих зборів сталася помилка.
           success: Публікацію зборів успішно скасовано.
+      assembly_user_roles:
+        edit:
+          title: Оновити учасника зборів.
+          update: Оновити
+        index:
+          assembly_admins_title: Учасники зборів
+        new:
+          create: Створити
+          title: Новий учасник зборів.
       menu:
         assemblies: Збори
         assemblies_submenu:
+          assembly_admins: Учасники зборів
+          attachment_collections: Збірки
+          attachment_files: Файли
           attachments: Вкладені файли
           categories: Розділи
           features: Складові
@@ -73,14 +85,25 @@ uk:
             created_at: 'Додано:'
             promoted: Висвітлено
             published: Опубліковано
-            title: Назва
+            title: Заголовок
           name: Збори
+        assembly_user_role:
+          fields:
+            email: Адреса електронної пошти
+            name: Ім'я
+            role: Роль
+          name: Учасник зборів
+          roles:
+            admin: Адміністратор
+            collaborator: Співавтор
+            moderator: Модератор
       titles:
         assemblies: Збори
     assemblies:
       admin:
         assemblies:
           form:
+            select_an_area: Оберіть терен
             slug_help: 'Cкорочені URL-адреси використовуються для створення посилань на ці збори. В них припустимі лише букви, цифри та тире, і вони мають починатися з букви. Приклад: %{url}'
         assembly_copies:
           form:
@@ -93,8 +116,9 @@ uk:
             active_assemblies: Започаті збори
             see_all_assemblies: Переглянути всі збори
       show:
+        area: Терен
         developer_group: Група зачинальників
-        local_area: Місцевість
+        local_area: Терен
         participatory_scope: Терен співучасті
         participatory_structure: Структура співучасті
         scope: Терен

data/db/migrate/20180125104426_add_reference_to_assemblies.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddReferenceToAssemblies < ActiveRecord::Migration[5.1]
+  def change
+    add_column :decidim_assemblies, :reference, :string
+  end
+end

data/db/migrate/20180216091553_add_area_to_assemblies.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddAreaToAssemblies < ActiveRecord::Migration[5.1]
+  def change
+    add_reference :decidim_assemblies, :decidim_area, index: true
+  end
+end

data/lib/decidim/assemblies/admin_engine.rb

@@ -24,6 +24,7 @@ module Decidim
             end
           end
 
+          resources :attachment_collections, controller: "assembly_attachment_collections"
           resources :attachments, controller: "assembly_attachments"
         end
 

data/lib/decidim/assemblies/participatory_space.rb

@@ -48,6 +48,20 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
         scope: n.positive? ? Decidim::Scope.reorder("RANDOM()").first : nil
       )
 
+      attachment_collection = Decidim::AttachmentCollection.create!(
+        name: Decidim::Faker::Localized.word,
+        description: Decidim::Faker::Localized.sentence(5),
+        collection_for: assembly
+      )
+
+      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: assembly
+      )
+
       Decidim::Attachment.create!(
         title: Decidim::Faker::Localized.sentence(2),
         description: Decidim::Faker::Localized.sentence(5),

data/lib/decidim/assemblies/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-assemblies
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.10.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-27 00:00:00.000000000 Z
+date: 2018-03-27 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.9.3
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
 description: Assemblies component for decidim.
 email:
 - josepjaume@gmail.com
@@ -72,6 +72,7 @@ files:
 - app/commands/decidim/assemblies/admin/copy_assembly.rb
 - app/commands/decidim/assemblies/admin/create_assembly.rb
 - app/commands/decidim/assemblies/admin/create_assembly_admin.rb
+- app/commands/decidim/assemblies/admin/destroy_assembly_admin.rb
 - app/commands/decidim/assemblies/admin/publish_assembly.rb
 - app/commands/decidim/assemblies/admin/unpublish_assembly.rb
 - app/commands/decidim/assemblies/admin/update_assembly.rb
@@ -81,6 +82,7 @@ files:
 - app/controllers/concerns/decidim/assemblies/admin/assembly_context.rb
 - app/controllers/decidim/assemblies/admin/application_controller.rb
 - app/controllers/decidim/assemblies/admin/assemblies_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_publications_controller.rb
@@ -110,6 +112,9 @@ files:
 - app/models/decidim/assemblies/abilities/everyone_ability.rb
 - app/models/decidim/assembly.rb
 - app/models/decidim/assembly_user_role.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/role_presenter.rb
 - app/presenters/decidim/assemblies/assembly_stats_presenter.rb
 - app/queries/decidim/assemblies/admin/admin_users.rb
 - app/queries/decidim/assemblies/assemblies_with_user_role.rb
@@ -159,6 +164,8 @@ files:
 - db/migrate/20170727190859_add_assemblies.rb
 - db/migrate/20170822153055_add_scopes_enabled_to_assemblies.rb
 - db/migrate/20180109105917_add_assembly_user_roles.rb
+- db/migrate/20180125104426_add_reference_to_assemblies.rb
+- db/migrate/20180216091553_add_area_to_assemblies.rb
 - db/seeds/Exampledocument.pdf
 - db/seeds/city.jpeg
 - db/seeds/city2.jpeg
@@ -190,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Decidim assemblies module