decidim-core 0.4.4 → 0.5.0

data/config/locales/it.yml

@@ -322,4 +322,4 @@ it:
       first: "« Primo"
       last: Ultimo »
       next: Successivo ›
-      previous: "‹ Precedente"
+      previous: "‹ Precedente"

data/config/locales/nl.yml

@@ -358,4 +358,4 @@ nl:
       last: Laatste »
       next: Volgende ›
       previous: "‹ Vorige"
-      truncate: "…"
+      truncate: "…"

data/config/locales/pl.yml

@@ -0,0 +1,91 @@
+pl:
+  activemodel:
+    attributes:
+      account:
+        delete_reason: Powód usunięcia konta
+      user:
+        email: Twój email
+        name: Twoje imię
+        password: Nowe hasło
+        user_group_name: Nazwa organizacji
+  activerecord:
+    attributes:
+      decidim/user:
+        password: Hasło
+        password_confirmation: Potwierdzenie hasła
+        remember_me: Zapamiętaj mnie
+  carrierwave:
+    errors:
+      image_too_big: Obraz jest zbyt duży
+  decidim:
+    account:
+      delete:
+        confirm:
+          close: Zamknij okno
+          ok: Tak, chcę usunąć moje konto
+          question: Czy na pewno chcesz usunąć swoje konto?
+          title: Usuń moje konto
+        explanation: Proszę podać przyczynę, dla której chcesz usunąć swoje konto (opcjonalne).
+      destroy:
+        error: Podczas usuwania Twojego konta wystąpił błąd.
+      show:
+        change_password: Zmień hasło
+        update_account: Zaktualizuj konto
+      update:
+        error: Podczas aktualizowania konta wystąpił błąd.
+    application:
+      documents:
+        related_documents: Powiązane dokumenty
+    authorization_handlers:
+      decidim/dummy_authorization_handler:
+        fields:
+          document_number: Numer dokumentu
+          postal_code: Kod pocztowy
+        name: Przykładowa autoryzacja
+      foo_authorization:
+        fields:
+          bar: Bar
+        name: Autoryzacja Foo
+    authorizations:
+      create:
+        error: Podczas tworzenia autoryzacji wystąpił błąd.
+    errors:
+      internal_server_error:
+        try_later: Spróbuj ponownie później.
+      not_found:
+        content_doesnt_exist: Ten adres jest nieprawidłowy lub został usunięty.
+    features:
+      dummy:
+        actions:
+          bar: Bar
+        settings:
+          global:
+            comments_enabled: Włączone komentarze
+          step:
+            comments_blocked: Komentarze zablokowane
+    filters:
+      linked_classes:
+        meeting: Spotkania
+        proposal: Propozycje
+    forms:
+      default_image: Domyślny obraz
+      errors:
+        error: W tym polu wystąpił błąd.
+    menu:
+      more_information: Więcej informacji
+      processes: Procesy
+    own_user_groups:
+      index:
+        rejected: Odrzucone
+    pages:
+      index:
+        title: Więcej informacji
+    participatory_process_groups:
+      show:
+        title: Tytuł
+    participatory_process_steps:
+      index:
+        process_steps: Etapy procesu
+    participatory_processes:
+      scopes:
+        global: Zakres globalny

data/config/routes.rb

@@ -55,6 +55,8 @@ Decidim::Core::Engine.routes.draw do
 
   resources :pages, only: [:index, :show], format: false
 
+  get "/scopes/search", to: "scopes#search", as: :scopes_search
+
   get "/static_map", to: "static_map#show", as: :static_map
   get "/cookies/accept", to: "cookie_policy#accept", as: :accept_cookies
 

data/db/migrate/20170605162500_add_hierarchy_to_scopes.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+class AddHierarchyToScopes < ActiveRecord::Migration[5.0]
+  class Scope < ApplicationRecord
+    self.table_name = :decidim_scopes
+  end
+
+  class Organization < ApplicationRecord
+    self.table_name = :decidim_organizations
+  end
+
+  def self.up
+    # schema migration
+    create_table :decidim_scope_types do |t|
+      t.references :decidim_organization, foreign_key: true, index: true
+      t.jsonb :name, null: false
+      t.jsonb :plural, null: false
+    end
+
+    # retrieve current data
+    current_data = Scope.select(:id, :name, :decidim_organization_id).as_json
+
+    change_table :decidim_scopes do |t|
+      t.remove_index :name
+      t.remove :name
+      t.jsonb :name
+      t.references :scope_type, foreign_key: { to_table: :decidim_scope_types }, index: true
+      t.references :parent, foreign_key: { to_table: :decidim_scopes }
+      t.string :code
+      t.integer :part_of, array: true, default: [], null: false
+      t.index :part_of, using: "gin"
+    end
+
+    current_data.each do |s|
+      locales = Organization.find(s["decidim_organization_id"]).available_locales
+      name = s["name"].gsub(/'/, "''")
+      execute("
+        UPDATE decidim_scopes
+        SET name = '#{Hash[locales.map { |locale| [locale, name] }].to_json}',
+            code = #{quote(s["id"])}
+        WHERE id = #{s["id"]}
+      ")
+    end
+
+    change_column_null :decidim_scopes, :name, false
+    change_column_null :decidim_scopes, :code, false
+    add_index :decidim_scopes, [:decidim_organization_id, :code], unique: true
+  end
+
+  def self.down
+    # schema migration
+    change_table :decidim_scopes do |t|
+      t.remove_index [:decidim_organization_id, :code]
+      t.change :name, :string, null: false, index: :uniqueness
+      t.remove :scope_type_id, :parent_id, :code, :part_of
+    end
+    add_index :decidim_scopes, :name, unique: true
+    drop_table :decidim_scope_types
+
+    # post migration data fixes
+    Scope.select(:id, :name).as_json.each do |s|
+      name = quote(JSON.parse(s["name"]).values.first)
+      execute("
+        UPDATE decidim_scopes
+        SET name = #{name}
+        WHERE id = #{s["id"]}
+      ")
+    end
+  end
+end

data/db/migrate/20170713131206_add_admin_to_users.rb

@@ -3,6 +3,11 @@
 class AddAdminToUsers < ActiveRecord::Migration[5.1]
   def up
     add_column :decidim_users, :admin, :boolean, null: false, default: false
-    Decidim::User.where("roles @> ?", "{admin}").update_all(admin: true)
+
+    execute <<~SQL
+      UPDATE decidim_users
+      SET admin = true
+      WHERE roles @> '{admin}'
+    SQL
   end
 end

data/db/migrate/20170713131308_migrate_user_roles_to_participatory_process_roles.rb

@@ -1,9 +1,13 @@
 # frozen_string_literal: true
 
 class MigrateUserRolesToParticipatoryProcessRoles < ActiveRecord::Migration[5.1]
+  class User < ApplicationRecord
+    self.table_name = :decidim_users
+  end
+
   def up
     participatory_processes = Decidim::ParticipatoryProcess.includes(:organization).all
-    Decidim::User.find_each do |user|
+    User.find_each do |user|
       next if user.roles.empty? || user.roles.include?("admin")
 
       processes = participatory_processes.select { |process| process.organization == user.organization }

data/db/migrate/20170720135441_add_managed_to_users.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddManagedToUsers < ActiveRecord::Migration[5.1]
+  def change
+    add_column :decidim_users, :managed, :boolean, null: false, default: false
+  end
+end

data/db/migrate/20170720140610_set_email_unique_in_organization_condition_for_managed_users.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class SetEmailUniqueInOrganizationConditionForManagedUsers < ActiveRecord::Migration[5.1]
+  def change
+    remove_index :decidim_users, %w(email decidim_organization_id)
+    add_index :decidim_users,
+              %w(email decidim_organization_id),
+              where: "(deleted_at IS NULL) AND (managed = 'f')",
+              name: "index_decidim_users_on_email_and_decidim_organization_id",
+              unique: true
+  end
+end

data/db/migrate/20170724130558_create_impersonation_logs.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class CreateImpersonationLogs < ActiveRecord::Migration[5.1]
+  def change
+    create_table :decidim_impersonation_logs do |t|
+      t.references :decidim_admin, index: true
+      t.references :decidim_user, index: true
+      t.datetime :started_at
+      t.datetime :ended_at
+      t.datetime :expired_at
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20170727125445_add_roles_to_users.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddRolesToUsers < ActiveRecord::Migration[5.1]
+  def change
+    add_column :decidim_users, :roles, :string, array: true, default: []
+  end
+end

data/db/migrate/20170804125402_attachment_description_nullable.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AttachmentDescriptionNullable < ActiveRecord::Migration[5.1]
+  def change
+    change_column :decidim_attachments, :description, :jsonb, null: true
+  end
+end

data/db/migrate/20170808080905_add_announcement_to_participatory_processes.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddAnnouncementToParticipatoryProcesses < ActiveRecord::Migration[5.1]
+  def change
+    add_column :decidim_participatory_processes, :announcement, :jsonb
+  end
+end

data/db/migrate/20170809084005_add_scopes_enabled_to_participatory_processes.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddScopesEnabledToParticipatoryProcesses < ActiveRecord::Migration[5.1]
+  def change
+    add_column :decidim_participatory_processes, :scopes_enabled, :boolean, null: false, default: true
+  end
+end

data/db/seeds.rb

@@ -3,6 +3,8 @@
 if !Rails.env.production? || ENV["SEED"]
   require "decidim/faker/localized"
 
+  seeds_root = File.join(__dir__, "seeds")
+
   organization = Decidim::Organization.first || Decidim::Organization.create!(
     name: Faker::Company.name,
     twitter_handler: Faker::Hipster.word,
@@ -15,17 +17,41 @@ if !Rails.env.production? || ENV["SEED"]
     description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
       Decidim::Faker::Localized.sentence(15)
     end,
-    homepage_image: File.new(File.join(__dir__, "seeds", "homepage_image.jpg")),
-    default_locale: I18n.default_locale,
-    available_locales: [:en, :ca, :es],
+    homepage_image: File.new(File.join(seeds_root, "homepage_image.jpg")),
+    default_locale: Decidim.default_locale,
+    available_locales: Decidim.available_locales,
     reference_prefix: Faker::Name.suffix
   )
 
+  province = Decidim::ScopeType.create!(
+    name: Decidim::Faker::Localized.literal("province"),
+    plural: Decidim::Faker::Localized.literal("provinces"),
+    organization: organization
+  )
+
+  municipality = Decidim::ScopeType.create!(
+    name: Decidim::Faker::Localized.literal("municipality"),
+    plural: Decidim::Faker::Localized.literal("municipalities"),
+    organization: organization
+  )
+
   3.times.each do
-    Decidim::Scope.create!(
-      name: Faker::Address.unique.state,
+    parent = Decidim::Scope.create!(
+      name: Decidim::Faker::Localized.literal(Faker::Address.unique.state),
+      code: Faker::Address.unique.country_code,
+      scope_type: province,
       organization: organization
     )
+
+    5.times.each do
+      Decidim::Scope.create!(
+        name: Decidim::Faker::Localized.literal(Faker::Address.unique.city),
+        code: parent.code + "-" + Faker::Address.unique.state_abbr,
+        scope_type: municipality,
+        organization: organization,
+        parent: parent
+      )
+    end
   end
 
   Decidim::User.find_or_initialize_by(email: "admin@example.org").update!(
@@ -70,8 +96,6 @@ if !Rails.env.production? || ENV["SEED"]
     end
   end
 
-  seeds_root = File.join(__dir__, "seeds")
-
   process_groups = []
   3.times do
     process_groups << Decidim::ParticipatoryProcessGroup.create!(
@@ -98,8 +122,7 @@ if !Rails.env.production? || ENV["SEED"]
       end,
       hero_image: File.new(File.join(seeds_root, "city.jpeg")),
       banner_image: File.new(File.join(seeds_root, "city2.jpeg")),
-      promoted: true,
-      published_at: 2.weeks.ago,
+      promoted: true, published_at: 2.weeks.ago,
       organization: organization,
       meta_scope: Decidim::Faker::Localized.word,
       developer_group: Decidim::Faker::Localized.sentence(1),
@@ -108,7 +131,8 @@ if !Rails.env.production? || ENV["SEED"]
       participatory_scope: Decidim::Faker::Localized.sentence(1),
       participatory_structure: Decidim::Faker::Localized.sentence(2),
       end_date: 2.month.from_now.at_midnight,
-      participatory_process_group: process_groups.sample
+      participatory_process_group: process_groups.sample,
+      scope: Faker::Boolean.boolean(0.5) ? nil : Decidim::Scope.reorder("RANDOM()").first
     )
   end
 

data/lib/decidim/core.rb

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # frozen_string_literal: true
 
 require "decidim/core/engine"
@@ -19,6 +18,7 @@ module Decidim
   autoload :Authorable, "decidim/authorable"
   autoload :Notifiable, "decidim/notifiable"
   autoload :Publicable, "decidim/publicable"
+  autoload :Scopable, "decidim/scopable"
   autoload :Features, "decidim/features"
   autoload :HasAttachments, "decidim/has_attachments"
   autoload :FeatureValidator, "decidim/feature_validator"
@@ -94,7 +94,9 @@ module Decidim
   end
 
   # Exposes a configuration option: The application default locale.
-  config_accessor :default_locale { :en }
+  config_accessor :default_locale do
+    :en
+  end
 
   # Exposes a configuration option: an object to configure geocoder
   config_accessor :geocoder
@@ -120,7 +122,9 @@ module Decidim
   end
 
   # Exposes a configuration option: the currency unit
-  config_accessor :currency_unit { "€" }
+  config_accessor :currency_unit do
+    "€"
+  end
 
   # Exposes a configuration option: The maximum file size of an attachment.
   config_accessor :maximum_attachment_size do
@@ -128,13 +132,15 @@ module Decidim
   end
 
   # The number of reports which an object can receive before hiding it
-  config_accessor :max_reports_before_hiding { 3 }
+  config_accessor :max_reports_before_hiding do
+    3
+  end
 
   # A base path for the uploads. If set, make sure it ends in a slash.
   # Uploads will be set to `<base_path>/uploads/`. This can be useful if you
   # want to use the same uploads place for both staging and production
   # environments, but in different folders.
-  config_accessor :base_uploads_path { nil }
+  config_accessor :base_uploads_path
 
   # Public: Registers a feature, usually held in an external library or in a
   # separate folder in the main repository. Exposes a DSL defined by

data/lib/decidim/core/engine.rb

@@ -81,6 +81,7 @@ module Decidim
         Decidim.configure do |config|
           config.abilities << "Decidim::Abilities::EveryoneAbility"
           config.abilities << "Decidim::Abilities::AdminAbility"
+          config.abilities << "Decidim::Abilities::UserManagerAbility"
           config.abilities << "Decidim::Abilities::ParticipatoryProcessAdminAbility"
           config.abilities << "Decidim::Abilities::ParticipatoryProcessCollaboratorAbility"
           config.abilities << "Decidim::Abilities::ParticipatoryProcessModeratorAbility"

data/lib/decidim/core/test.rb

@@ -9,6 +9,8 @@ require "decidim/core/test/shared_examples/has_scope"
 require "decidim/core/test/shared_examples/has_category"
 require "decidim/core/test/shared_examples/has_reference"
 require "decidim/core/test/shared_examples/comments_examples"
+require "decidim/core/test/shared_examples/announcements_examples"
+require "decidim/core/test/shared_examples/process_announcements_examples"
 require "decidim/core/test/shared_examples/reportable"
 require "decidim/core/test/shared_examples/reports_examples"
 require "decidim/core/test/shared_examples/manage_moderations_examples"