decidim-core 0.15.2 → 0.16.0

data/config/locales/uk.yml

@@ -374,7 +374,6 @@ uk:
       expired_session: Скінчився поточний сеанс виступу в ролі учасника.
     menu:
       home: Головна
-      more_information: Додаткові відомості
     messaging:
       conversation_mailer:
         new_conversation:
@@ -391,13 +390,9 @@ uk:
         create:
           error: Бесіда не розпочата. Спробуйте ще раз пізніше
         index:
-          from: Від
-          last_message_html: Останнє повідомлення <strong>%{time} тому</strong>
           no_conversations: У вас ще немає бесід
-        show:
-          conversation_with_html: Бесіда з <strong>%{name}</strong>
-          reply: Відповісти
-          send: Надіслати
+        reply:
+          title: Відповісти
         start:
           send: Надіслати
           title: Почати бесіду
@@ -482,8 +477,6 @@ uk:
           votes_count: Голосів
         sub_hero:
           register: Зареєструватися
-      index:
-        title: Додаткові відомості
       terms_and_conditions:
         accept:
           error: Під час прийняття умов участі виникла помилка.
@@ -510,10 +503,8 @@ uk:
     profiles:
       default_officialization_text_for_users: Особу цього учасника прилюдно підтверджено, його ім'я чи роль перевірено на відповідність його справжньому імені та ролі
       show:
-        conversations: Бесіди
         followers: Ті, хто стежить
         following: 'Стежить за:'
-        notifications: Сповіщення
       user:
         edit_profile: Редагувати профіль
     reported_mailer:
@@ -540,14 +531,9 @@ uk:
       prompt: Оберіть обсяг
       scopes: Обсяги
     search:
-      filter:
-        all: Усі
-        component: Складові
       results_found_for_term: '%{count} Висліди пошуку: "%{term}"'
       term_input_placeholder: Шукати
     searches:
-      filters:
-        search: Шукати
       filters_small_view:
         close_modal: Закрити віконце
         filter: Відібрати

data/config/routes.rb

@@ -16,6 +16,14 @@ Decidim::Core::Engine.routes.draw do
                omniauth_callbacks: "decidim/devise/omniauth_registrations"
              }
 
+  devise_for :user_groups,
+             class_name: "Decidim::UserGroup",
+             module: :devise,
+             router_name: :decidim,
+             controllers: {
+               confirmations: "decidim/devise/confirmations"
+             }
+
   devise_scope :user do
     post "omniauth_registrations" => "devise/omniauth_registrations#create"
   end
@@ -56,6 +64,8 @@ Decidim::Core::Engine.routes.draw do
       end
     end
 
+    resource :user_interests, only: [:show, :update]
+
     get "/authorization_modals/:authorization_action/f/:component_id(/:resource_name/:resource_id)", to: "authorization_modals#show", as: :authorization_modal
 
     resources :groups, except: [:destroy, :index, :show] do
@@ -71,6 +81,7 @@ Decidim::Core::Engine.routes.draw do
           post :demote
         end
       end
+      resource :email_confirmation, only: [:create], controller: "group_email_confirmations"
 
       member do
         delete :leave
@@ -85,6 +96,8 @@ Decidim::Core::Engine.routes.draw do
     get "badges", to: "profiles#badges", as: "profile_badges"
     get "groups", to: "profiles#groups", as: "profile_groups"
     get "members", to: "profiles#members", as: "profile_members"
+    get "activity", to: "user_activities#index", as: "profile_activity"
+    get "timeline", to: "user_timeline#index", as: "profile_timeline"
   end
 
   resources :pages, only: [:index, :show], format: false
@@ -102,8 +115,21 @@ Decidim::Core::Engine.routes.draw do
   match "/404", to: "errors#not_found", via: :all
   match "/500", to: "errors#internal_server_error", via: :all
 
+  get "/open-data/download", to: "open_data#download", as: :open_data_download
+
   resource :follow, only: [:create, :destroy]
   resource :report, only: [:create]
+  resources :amends, only: [:new, :reject, :accept], controller: :amendments do
+    collection do
+      post :create
+    end
+    member do
+      patch :reject
+      post :promote
+      get :review
+      patch :accept
+    end
+  end
 
   namespace :gamification do
     resources :badges, only: [:index]
@@ -123,5 +149,5 @@ Decidim::Core::Engine.routes.draw do
     get "/me" => "doorkeeper/credentials#me"
   end
 
-  root to: "pages#show", id: "home"
+  root to: "homepage#show"
 end

data/db/migrate/20171212103803_create_unique_nicknames.rb

@@ -11,7 +11,7 @@ class CreateUniqueNicknames < ActiveRecord::Migration[5.1]
     add_column :decidim_users, :nickname, :string, limit: 20
 
     User.where.not(name: nil).find_each do |user|
-      user.update!(nickname: User.nicknamize(user.name, decidim_organization_id: user.decidim_organization_id))
+      user.update!(nickname: UserBaseEntity.nicknamize(user.name, decidim_organization_id: user.decidim_organization_id))
     end
 
     add_index :decidim_users,

data/db/migrate/20180221101934_fix_nickname_index.rb

@@ -11,7 +11,7 @@ class FixNicknameIndex < ActiveRecord::Migration[5.1]
     User.where(nickname: nil)
         .where(deleted_at: nil)
         .where(managed: false)
-        .find_each { |u| u.update(nickname: User.nicknamize(u.name, decidim_organization_id: u.decidim_organization_id)) }
+        .find_each { |u| u.update(nickname: UserBaseEntity.nicknamize(u.name, decidim_organization_id: u.decidim_organization_id)) }
 
     # rubocop:disable Rails/SkipsModelValidations
     User.where(nickname: nil).update_all("nickname = ''")

data/db/migrate/20180706104107_add_nickname_to_managed_users.rb

@@ -7,7 +7,7 @@ class AddNicknameToManagedUsers < ActiveRecord::Migration[5.2]
 
   def up
     User.where(managed: true, nickname: nil).includes(:organization).find_each do |user|
-      user.nickname = User.nicknamize(user.name, organization: user.organization)
+      user.nickname = UserBaseEntity.nicknamize(user.name, organization: user.organization)
       user.save
     end
   end

data/db/migrate/20180720114847_create_decidim_amendments.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class CreateDecidimAmendments < ActiveRecord::Migration[5.2]
+  def change
+    create_table :decidim_amendments do |t|
+      t.references :decidim_user, null: false
+      t.references :decidim_amendable, polymorphic: true, index: false
+      t.references :decidim_emendation, polymorphic: true, index: false
+      t.string :state, index: true
+      t.timestamps
+    end
+
+    add_index :decidim_amendments,
+              [:decidim_user_id, :decidim_amendable_id, :decidim_amendable_type],
+              name: "index_on_amender_and_amendable"
+
+    add_index :decidim_amendments,
+              [:decidim_amendable_id, :decidim_amendable_type],
+              name: "index_on_amendable"
+  end
+end

data/db/migrate/20181001124950_move_users_groups_to_users_table.rb

@@ -64,7 +64,7 @@ class MoveUsersGroupsToUsersTable < ActiveRecord::Migration[5.2]
         verified_at: old_user_group.verified_at
       }
       new_attributes = clean_attributes.merge(
-        nickname: User.nicknamize(clean_attributes["name"]),
+        nickname: UserBaseEntity.nicknamize(clean_attributes["name"]),
         extended_data: extended_data
       )
       new_user_group = NewUserGroup.create!(new_attributes)

data/db/migrate/20181022090732_add_columns_to_pages.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class AddColumnsToPages < ActiveRecord::Migration[5.2]
+  class StaticPage < ApplicationRecord
+    self.table_name = :decidim_static_pages
+  end
+
+  # rubocop:disable Rails/SkipsModelValidations
+  def change
+    change_table :decidim_static_pages do |t|
+      t.column :weight, :integer, default: nil, null: true
+      t.column :show_in_footer, :boolean, default: false, null: false
+    end
+
+    Decidim::StaticPage.where(
+      slug: ["faq", "terms-and-conditions", "accessibility"]
+    ).update_all(show_in_footer: true)
+    # rubocop:enable Rails/SkipsModelValidations
+  end
+end

data/db/migrate/20181023104416_add_static_page_topics.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class AddStaticPageTopics < ActiveRecord::Migration[5.2]
+  def change
+    create_table :decidim_static_page_topics do |t|
+      t.column :title, :jsonb, null: false
+      t.column :description, :jsonb, null: false
+      t.references :organization, null: false
+    end
+
+    change_table :decidim_static_pages do |t|
+      t.references :topic
+    end
+  end
+end

data/db/migrate/20181025082245_add_timestamps_to_components.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class AddTimestampsToComponents < ActiveRecord::Migration[5.2]
+  def change
+    add_timestamps :decidim_components, null: true
+    # rubocop:disable Rails/SkipsModelValidations
+    Decidim::Component.update_all(created_at: Time.current, updated_at: Time.current)
+    # rubocop:enable Rails/SkipsModelValidations
+    change_column_null :decidim_components, :created_at, false
+    change_column_null :decidim_components, :updated_at, false
+  end
+end

data/db/migrate/20181029121244_add_welcome_notification.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class AddWelcomeNotification < ActiveRecord::Migration[5.2]
+  def change
+    change_table :decidim_organizations do |t|
+      t.boolean :send_welcome_notification, null: false, default: false
+      t.jsonb :welcome_notification_subject, null: true
+      t.jsonb :welcome_notification_body, null: true
+    end
+
+    execute "UPDATE decidim_organizations SET send_welcome_notification = 'true'"
+  end
+end

data/db/migrate/20181108131058_add_users_registration_mode_to_organizations.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddUsersRegistrationModeToOrganizations < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_organizations, :users_registration_mode, :integer, default: 0, null: false
+  end
+end

data/db/migrate/20181113101935_create_decidim_contextual_help_sections.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class CreateDecidimContextualHelpSections < ActiveRecord::Migration[5.2]
+  def change
+    create_table :decidim_contextual_help_sections do |t|
+      t.string :section_id, null: false
+      t.references :organization, null: false
+      t.jsonb :content, null: false
+    end
+  end
+end

data/db/migrate/20181115102958_add_following_and_followers_counters_to_users.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class AddFollowingAndFollowersCountersToUsers < ActiveRecord::Migration[5.2]
+  def up
+    add_column :decidim_users, :following_count, :integer, null: false, default: 0
+    add_column :decidim_users, :following_users_count, :integer, null: false, default: 0
+    add_column :decidim_users, :followers_count, :integer, null: false, default: 0
+
+    Decidim::UserBaseEntity.find_each do |entity|
+      follower_count = Decidim::Follow.where(followable: entity).count
+      following_count = Decidim::Follow.where(decidim_user_id: entity.id).count
+      following_users_count = Decidim::Follow.where(decidim_user_id: entity.id, decidim_followable_type: ["Decidim::UserBaseEntity", "Decidim::User", "Decidim::UserGroup"]).count
+
+      entity.followers_count = follower_count
+      entity.following_count = following_count
+      entity.following_users_count = following_users_count
+      entity.save
+    end
+  end
+
+  def down
+    remove_column :decidim_users, :following_count
+    remove_column :decidim_users, :following_users_count
+    remove_column :decidim_users, :followers_count
+  end
+end

data/db/migrate/20181119140636_add_columns_to_static_page_topic.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class AddColumnsToStaticPageTopic < ActiveRecord::Migration[5.2]
+  def change
+    change_table :decidim_static_page_topics do |t|
+      t.column :weight, :integer, default: nil, null: true
+      t.column :show_in_footer, :boolean, default: false, null: false
+    end
+  end
+end

data/db/migrate/20181126145142_add_id_documents_fields_to_org.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class AddIdDocumentsFieldsToOrg < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_organizations, :id_documents_methods, :string, array: true, default: ["online"]
+    add_column :decidim_organizations, :id_documents_explanation_text, :jsonb, default: {}
+
+    # rubocop:disable Rails/SkipsModelValidations
+    Decidim::Organization.reset_column_information
+    Decidim::Organization.update_all(id_documents_methods: ["online"])
+    # rubocop:enable Rails/SkipsModelValidations
+  end
+end

data/db/migrate/20181204110723_remove_following_users_count_from_users.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class RemoveFollowingUsersCountFromUsers < ActiveRecord::Migration[5.2]
+  def up
+    remove_column :decidim_users, :following_users_count
+  end
+
+  def down
+    add_column :decidim_users, :following_users_count, :integer, null: false, default: 0
+
+    Decidim::UserBaseEntity.find_each do |entity|
+      following_users_count = Decidim::Follow.where(decidim_user_id: entity.id, decidim_followable_type: ["Decidim::UserBaseEntity", "Decidim::User", "Decidim::UserGroup"]).count
+      entity.following_users_count = following_users_count
+      entity.save
+    end
+  end
+end

data/db/migrate/20181211080834_add_scope_to_action_logs.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddScopeToActionLogs < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_action_logs, :decidim_scope_id, :integer
+  end
+end

data/db/migrate/20181211090933_add_area_to_action_logs.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddAreaToActionLogs < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_action_logs, :decidim_area_id, :integer
+  end
+end

data/db/migrate/20181214101250_add_notification_types_to_users.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class AddNotificationTypesToUsers < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_users, :notification_types, :string, default: "all"
+    # rubocop:disable Rails/SkipsModelValidations
+    Decidim::UserBaseEntity.update_all(notification_types: "all")
+    # rubocop:enable Rails/SkipsModelValidations
+
+    change_column_null :decidim_users, :notification_types, false
+  end
+end

data/db/migrate/20181218171503_add_user_groups_switch_to_organizations.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddUserGroupsSwitchToOrganizations < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_organizations, :user_groups_enabled, :boolean, null: false, default: false
+    execute "UPDATE decidim_organizations set user_groups_enabled = true"
+  end
+end

data/db/seeds.rb

@@ -31,8 +31,11 @@ if !Rails.env.production? || ENV["SEED"]
     available_locales: Decidim.available_locales,
     reference_prefix: Faker::Name.suffix,
     available_authorizations: Decidim.authorization_workflows.map(&:name),
+    users_registration_mode: :enabled,
     tos_version: Time.current,
-    badges_enabled: true
+    badges_enabled: true,
+    user_groups_enabled: true,
+    send_welcome_notification: true
   )
 
   if organization.top_scopes.none?
@@ -140,6 +143,7 @@ if !Rails.env.production? || ENV["SEED"]
       user_group = Decidim::UserGroup.create!(
         name: Faker::Company.unique.name,
         nickname: Faker::Twitter.unique.screen_name,
+        email: Faker::Internet.email,
         extended_data: {
           document_number: Faker::Number.number(10),
           phone: Faker::PhoneNumber.phone_number,
@@ -147,6 +151,7 @@ if !Rails.env.production? || ENV["SEED"]
         },
         decidim_organization_id: user.organization.id
       )
+      user_group.confirm
 
       Decidim::UserGroupMembership.create!(
         user: user,

data/lib/decidim/amendable.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This concern contains the logic related to amendable resources.
+  module Amendable
+    extend ActiveSupport::Concern
+
+    included do
+      has_many :amendments, as: :amendable, foreign_key: "decidim_amendable_id", foreign_type: "decidim_amendable_type", class_name: "Decidim::Amendment"
+
+      # resource.emendations : resources that have amend the resource
+      has_many :emendations, through: :amendments, source: :emendation, source_type: name, inverse_of: :emendations
+
+      # resource.amenders :  users that have emendations for the resource
+      has_many :amenders, through: :amendments, source: :amender
+
+      # resource.amended : the original resource that was amended
+      has_one :amended, as: :amendable, foreign_key: "decidim_emendation_id", foreign_type: "decidim_emendation_type", class_name: "Decidim::Amendment"
+      has_one :amendable, through: :amended, source: :amendable, source_type: name
+    end
+
+    class_methods do
+      attr_reader :amendable_options
+      # Public: Configures amendable for this model.
+      #
+      # fields  - An `Array` of `symbols` specifying the fields that can be
+      #           amended.
+      # ignore  - An `Array` of `symbols` specifying the fields to be
+      #           ignored from amendable when creating the related emendation,
+      #           the :id is allways ignored.
+      # reset   - The counters that should be reseted on the creation of the emmendation
+      # form    - The form used for the validation and creation of the emmendation
+      #
+      # Returns nothing.
+      def amendable(fields: nil, ignore: [], reset: nil, form: nil)
+        @amendable_options = {}
+        raise "You must provide a set of fields to amend" unless fields
+        raise "You must provide a form class of the amendable" unless form
+        @amendable_options[:fields] = fields
+        @amendable_options[:ignore_fields] = ignore + [:id, :created_at, :updated_at]
+        @amendable_options[:reset] = reset
+        @amendable_options[:form] = form
+      end
+    end
+
+    def fields
+      self.class.amendable_options[:fields]
+    end
+
+    def ignore_fields
+      self.class.amendable_options[:ignore_fields]
+    end
+
+    def form
+      self.class.amendable_options[:form].constantize
+    end
+
+    def amendment
+      return Decidim::Amendment.find_by(emendation: id) if emendation?
+      Decidim::Amendment.find_by(amendable: id)
+    end
+
+    def emendation?
+      true if amendable.present?
+    end
+
+    def amendable?
+      return false if emendation?
+      component.settings.amendments_enabled
+    end
+
+    def resource_state
+      attributes["state"]
+    end
+
+    def emendation_state
+      return resource_state if resource_state == "withdrawn"
+      amendment.state if emendation?
+    end
+
+    def state
+      return emendation_state if emendation?
+      resource_state
+    end
+  end
+end