decidim-assemblies 0.8.4 → 0.9.0

data/config/locales/sv.yml

@@ -0,0 +1,165 @@
+sv:
+  activemodel:
+    attributes:
+      assembly:
+        banner_image: Banner image
+        copy_categories: Kopiera kategorier
+        copy_features: Kopiera funktioner
+        description: Beskrivning
+        developer_group: Utvecklargrupp
+        domain: Domän
+        hashtag: hashtag
+        hero_image: Hembild
+        local_area: Lokalt område
+        meta_scope: Omfattning metadata
+        participatory_scope: Deltagande räckvidd
+        participatory_structure: Deltagande struktur
+        promoted: främjas
+        scope_id: Omfattning
+        scopes_enabled: Scopes aktiverade
+        short_description: Kort beskrivning
+        slug: URL slug
+        subtitle: Texta
+        target: Mål
+        title: Titel
+  decidim:
+    admin:
+      assemblies:
+        create:
+          error: Det uppstod ett fel vid att skapa en ny enhet.
+          success: Församlingen skapades framgångsrikt.
+        destroy:
+          success: Församlingen förstördes framgångsrikt.
+        edit:
+          update: Uppdatering
+        form:
+          title: Allmän information
+        index:
+          not_published: Ej publicerad
+          published: Publicerad
+        new:
+          create: Skapa
+          title: Ny sammansättning
+        update:
+          error: Det uppstod ett fel vid uppdateringen av den här enheten.
+          success: Församlingen uppdaterades framgångsrikt.
+      assemblies_copies:
+        create:
+          error: Det uppstod ett fel vid duplicering av den här enheten.
+          success: Sammansättning dupliceras framgångsrikt.
+      assembly_copies:
+        new:
+          copy: Kopiera
+          select: Välj vilken data du vill duplicera
+          title: Duplikat montering
+      assembly_publications:
+        create:
+          error: Det uppstod ett fel vid publicering av denna montering.
+          success: Församling publiceras framgångsrikt.
+        destroy:
+          error: Ett fel uppstod vid publicering av denna montering.
+          success: Sammansättningen avpubliceras framgångsrikt.
+      assembly_user_roles:
+        create:
+          error: Det gick inte att lägga till en användare för den här enheten.
+          success: Användaren skapades framgångsrikt för den här enheten.
+        destroy:
+          success: Användaren förstördes framgångsrikt för denna montering.
+        edit:
+          title: Uppdatera monteringsanvändaren.
+          update: Uppdatering
+        index:
+          assembly_admins_title: Monteringsanvändare
+        new:
+          create: Skapa
+          title: Ny monteringsanvändare.
+        update:
+          error: Det uppstod ett fel som uppdaterade en användare för den här enheten.
+          success: Användaren uppdaterades framgångsrikt för denna montering.
+      menu:
+        assemblies: Assemblies
+        assemblies_submenu:
+          assembly_admins: Monteringsanvändare
+          attachments: bilagor
+          categories: kategorier
+          features: Funktioner
+          info: Info
+          moderations: modere
+      models:
+        assembly:
+          fields:
+            created_at: Skapad vid
+            promoted: Markerad
+            published: Publicerad
+            title: Titel
+          name: hopsättning
+        assembly_user_role:
+          fields:
+            email: E-post
+            name: namn
+            role: Roll
+          name: Monteringsanvändare
+          roles:
+            admin: Administratör
+            collaborator: Medarbetare
+            moderator: moderator
+      titles:
+        assemblies: Assemblies
+    assemblies:
+      admin:
+        assemblies:
+          form:
+            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:
+            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}'
+      index:
+        title: Assemblies
+      pages:
+        home:
+          highlighted_assemblies:
+            active_assemblies: Aktiva aggregat
+            see_all_assemblies: Se alla församlingar
+      show:
+        developer_group: Utvecklargrupp
+        local_area: Lokalt område
+        participatory_scope: Deltagande räckvidd
+        participatory_structure: Deltagande struktur
+        scope: Omfattning
+        target: Mål
+      statistics:
+        answers_count: svar
+        assemblies_count: Assemblies
+        comments_count: kommentarer
+        headline: Aktivitet
+        meetings_count: möten
+        orders_count: röster
+        pages_count: sidor
+        projects_count: projekt
+        proposals_count: förslag
+        results_count: Resultat
+        surveys_count: Undersökningar
+        users_count: Deltagare
+        votes_count: röster
+    menu:
+      assemblies: Assemblies
+  layouts:
+    decidim:
+      assemblies:
+        assembly:
+          take_part: Ta del
+        index:
+          promoted_assemblies: Utrustade församlingar
+        order_by_assemblies:
+          assemblies:
+            one: "%{count} montering"
+            other: "%{count} sammansättningar"
+        promoted_assembly:
+          more_info: Mer information
+          take_part: Ta del
+      assembly_header:
+        assembly_menu_item: Sammansättningen
+        unfold: Veckla ut
+      assembly_widgets:
+        show:
+          take_part: Ta del

data/db/migrate/20180109105917_add_assembly_user_roles.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddAssemblyUserRoles < ActiveRecord::Migration[5.1]
+  def change
+    create_table :decidim_assembly_user_roles do |t|
+      t.integer :decidim_user_id
+      t.integer :decidim_assembly_id
+      t.string :role
+      t.timestamps
+    end
+
+    add_index :decidim_assembly_user_roles,
+              [:decidim_assembly_id, :decidim_user_id, :role],
+              unique: true,
+              name: "index_unique_user_and_assembly_role"
+  end
+end

data/lib/decidim/assemblies/admin_engine.rb

@@ -18,6 +18,12 @@ module Decidim
           resource :publish, controller: "assembly_publications", only: [:create, :destroy]
           resources :copies, controller: "assembly_copies", only: [:new, :create]
 
+          resources :user_roles, controller: "assembly_user_roles" do
+            member do
+              post :resend_invitation, to: "assembly_user_roles#resend_invitation"
+            end
+          end
+
           resources :attachments, controller: "assembly_attachments"
         end
 
@@ -59,7 +65,10 @@ module Decidim
       initializer "decidim_assemblies.inject_abilities_to_user" do |_app|
         Decidim.configure do |config|
           config.admin_abilities += [
-            "Decidim::Assemblies::Abilities::Admin::AdminAbility"
+            "Decidim::Assemblies::Abilities::Admin::AdminAbility",
+            "Decidim::Assemblies::Abilities::Admin::AssemblyModeratorAbility",
+            "Decidim::Assemblies::Abilities::Admin::AssemblyCollaboratorAbility",
+            "Decidim::Assemblies::Abilities::Admin::AssemblyAdminAbility"
           ]
         end
       end
@@ -71,7 +80,7 @@ module Decidim
                     icon_name: "dial",
                     position: 3.5,
                     active: :inclusive,
-                    if: can?(:manage, Decidim::Assembly)
+                    if: can?(:read, Decidim::Assembly)
         end
       end
     end

data/lib/decidim/assemblies/engine.rb

@@ -45,11 +45,20 @@ module Decidim
         Decidim.configure do |config|
           config.abilities += [
             "Decidim::Assemblies::Abilities::EveryoneAbility",
+            "Decidim::Assemblies::Abilities::AssemblyAdminAbility",
+            "Decidim::Assemblies::Abilities::AssemblyCollaboratorAbility",
+            "Decidim::Assemblies::Abilities::AssemblyModeratorAbility",
             "Decidim::Assemblies::Abilities::AdminAbility"
           ]
         end
       end
 
+      initializer "decidim.stats" do
+        Decidim.stats.register :assemblies_count, priority: StatsRegistry::HIGH_PRIORITY do |organization, _start_at, _end_at|
+          Decidim::Assembly.where(organization: organization).published.count
+        end
+      end
+
       initializer "decidim_assemblies.menu" do
         Decidim.menu :menu do |menu|
           menu.item I18n.t("menu.assemblies", scope: "decidim"),

data/lib/decidim/assemblies/participatory_space.rb

@@ -4,6 +4,10 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
   participatory_space.icon = "decidim/assemblies/icon.svg"
   participatory_space.model_class_name = "Decidim::Assembly"
 
+  participatory_space.participatory_spaces do |organization|
+    Decidim::Assemblies::OrganizationAssemblies.new(organization).query
+  end
+
   participatory_space.context(:public) do |context|
     context.engine = Decidim::Assemblies::Engine
     context.layout = "layouts/decidim/assembly"
@@ -11,13 +15,14 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
 
   participatory_space.context(:admin) do |context|
     context.engine = Decidim::Assemblies::AdminEngine
+    context.layout = "layouts/decidim/admin/assembly"
   end
 
   participatory_space.seeds do
     organization = Decidim::Organization.first
     seeds_root = File.join(__dir__, "..", "..", "..", "db", "seeds")
 
-    2.times do
+    2.times do |n|
       assembly = Decidim::Assembly.create!(
         title: Decidim::Faker::Localized.sentence(5),
         slug: Faker::Internet.unique.slug(nil, "-"),
@@ -40,7 +45,7 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
         target: Decidim::Faker::Localized.sentence(3),
         participatory_scope: Decidim::Faker::Localized.sentence(1),
         participatory_structure: Decidim::Faker::Localized.sentence(2),
-        scope: Faker::Boolean.boolean(0.5) ? nil : Decidim::Scope.reorder("RANDOM()").first
+        scope: n.positive? ? Decidim::Scope.reorder("RANDOM()").first : nil
       )
 
       Decidim::Attachment.create!(

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

@@ -38,4 +38,40 @@ FactoryBot.define do
       published_at { Time.current }
     end
   end
+
+  factory :assembly_user_role, class: "Decidim::AssemblyUserRole" do
+    user
+    assembly { create :assembly, organization: user.organization }
+    role "admin"
+  end
+
+  factory :assembly_admin, parent: :user, class: "Decidim::User" do
+    transient do
+      assembly { create(:assembly) }
+    end
+
+    organization { assembly.organization }
+
+    after(:create) do |user, evaluator|
+      create :assembly_user_role,
+             user: user,
+             assembly: evaluator.assembly,
+             role: :admin
+    end
+  end
+
+  factory :assembly_moderator, parent: :user, class: "Decidim::User" do
+    transient do
+      assembly { create(:assembly) }
+    end
+
+    organization { assembly.organization }
+
+    after(:create) do |user, evaluator|
+      create :assembly_user_role,
+             user: user,
+             assembly: evaluator.assembly,
+             role: :moderator
+    end
+  end
 end

data/lib/decidim/assemblies/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-assemblies
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.9.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-16 00:00:00.000000000 Z
+date: 2018-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,43 +18,43 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.4
-description: Assemblies plugin for decidim
+        version: 0.9.0
+description: Assemblies component for decidim.
 email:
 - josepjaume@gmail.com
 - mrc2407@gmail.com
@@ -71,9 +71,11 @@ files:
 - app/assets/javascripts/decidim/assemblies/admin/assemblies.js.es6
 - 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/publish_assembly.rb
 - app/commands/decidim/assemblies/admin/unpublish_assembly.rb
 - app/commands/decidim/assemblies/admin/update_assembly.rb
+- app/commands/decidim/assemblies/admin/update_assembly_admin.rb
 - app/constraints/decidim/assemblies/current_assembly.rb
 - app/constraints/decidim/assemblies/current_feature.rb
 - app/controllers/concerns/decidim/assemblies/admin/assembly_context.rb
@@ -82,6 +84,7 @@ files:
 - 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
+- app/controllers/decidim/assemblies/admin/assembly_user_roles_controller.rb
 - app/controllers/decidim/assemblies/admin/categories_controller.rb
 - app/controllers/decidim/assemblies/admin/concerns/assembly_admin.rb
 - app/controllers/decidim/assemblies/admin/exports_controller.rb
@@ -93,12 +96,23 @@ files:
 - app/controllers/decidim/assemblies/categories_controller.rb
 - app/forms/decidim/assemblies/admin/assembly_copy_form.rb
 - app/forms/decidim/assemblies/admin/assembly_form.rb
+- app/forms/decidim/assemblies/admin/assembly_user_role_form.rb
 - app/models/decidim/assemblies/abilities/admin/admin_ability.rb
+- app/models/decidim/assemblies/abilities/admin/assembly_admin_ability.rb
+- app/models/decidim/assemblies/abilities/admin/assembly_collaborator_ability.rb
+- app/models/decidim/assemblies/abilities/admin/assembly_moderator_ability.rb
+- app/models/decidim/assemblies/abilities/admin/assembly_role_ability.rb
 - app/models/decidim/assemblies/abilities/admin_ability.rb
+- app/models/decidim/assemblies/abilities/assembly_admin_ability.rb
+- app/models/decidim/assemblies/abilities/assembly_collaborator_ability.rb
+- app/models/decidim/assemblies/abilities/assembly_moderator_ability.rb
+- app/models/decidim/assemblies/abilities/assembly_role_ability.rb
 - app/models/decidim/assemblies/abilities/everyone_ability.rb
 - app/models/decidim/assembly.rb
+- app/models/decidim/assembly_user_role.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
 - app/queries/decidim/assemblies/organization_assemblies.rb
 - app/queries/decidim/assemblies/organization_prioritized_assemblies.rb
 - app/queries/decidim/assemblies/organization_published_assemblies.rb
@@ -113,6 +127,10 @@ files:
 - app/views/decidim/assemblies/admin/assemblies/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_user_roles/_form.html.erb
+- app/views/decidim/assemblies/admin/assembly_user_roles/edit.html.erb
+- app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb
+- app/views/decidim/assemblies/admin/assembly_user_roles/new.html.erb
 - app/views/decidim/assemblies/assemblies/_promoted_assembly.html.erb
 - app/views/decidim/assemblies/assemblies/_statistics.html.erb
 - app/views/decidim/assemblies/assemblies/index.html.erb
@@ -129,14 +147,18 @@ files:
 - config/locales/eu.yml
 - config/locales/fi.yml
 - config/locales/fr.yml
+- config/locales/gl.yml
 - config/locales/it.yml
 - config/locales/nl.yml
 - config/locales/pl.yml
+- config/locales/pt-BR.yml
 - config/locales/pt.yml
 - config/locales/ru.yml
+- config/locales/sv.yml
 - config/locales/uk.yml
 - db/migrate/20170727190859_add_assemblies.rb
 - db/migrate/20170822153055_add_scopes_enabled_to_assemblies.rb
+- db/migrate/20180109105917_add_assembly_user_roles.rb
 - db/seeds/Exampledocument.pdf
 - db/seeds/city.jpeg
 - db/seeds/city2.jpeg
@@ -160,7 +182,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.1
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -168,8 +190,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
-summary: Assemblies plugin for decidim
+summary: Decidim assemblies module
 test_files: []