decidim-core 0.10.1 → 0.11.0.pre1

data/config/locales/sv.yml

@@ -6,11 +6,13 @@ sv:
       report:
         details: Ytterligare kommentarer
       user:
+        about: Handla om
         email: Din e-post
         name: Ditt namn
-        nickname: Din korta, unika identifierare i decidim
+        nickname: Din korta, unika identifierare
         password: Nytt lösenord
         password_confirmation: Bekräfta ditt nya lösenord
+        personal_url: Personlig URL
         remove_avatar: Ta bort avatar
         user_group_document_number: Organisationsdokumentnummer
         user_group_name: Organisationsnamn
@@ -54,11 +56,15 @@ sv:
         success: Ditt konto har uppdaterats.
         success_with_email_confirmation: Ditt konto har uppdaterats. Du får ett e-postmeddelande för att bekräfta din nya e-postadress.
     admin_log:
-      feature:
-        create: "%{user_name} lagt till %{resource_name} funktion till %{space_name} rymden"
-        delete: "%{user_name} tog bort %{resource_name} funktion från %{space_name} rymden"
-        publish: "%{user_name} publicerade %{resource_name} -funktionen i %{space_name} -utrymmet"
-        unpublish: "%{user_name} opublicerade %{resource_name} -funktionen från %{space_name} -platsen"
+      area:
+        create: "%{user_name} skapade området %{resource_name}"
+        delete: "%{user_name} raderade området %{resource_name}"
+        update: "%{user_name} uppdaterade området %{resource_name}"
+      component:
+        create: "%{user_name} lade till %{resource_name} komponenten till %{space_name} utrymmet"
+        delete: "%{user_name} tog bort komponenten %{resource_name} från %{space_name} -utrymmet"
+        publish: "%{user_name} publicerade %{resource_name} -komponenten i %{space_name} -utrymmet"
+        unpublish: "%{user_name} opublicerade %{resource_name} -komponenten från %{space_name} -utrymmet"
       moderation:
         hide: "%{user_name} gömde en resurs av typ %{resource_type} i %{space_name} rymden"
         unreport: "%{user_name} unreported en resurs av typ %{resource_type} i %{space_name} rymden"
@@ -67,6 +73,10 @@ sv:
         delete: "%{user_name} raderade %{resource_name} nyhetsbrev"
         deliver: "%{user_name} levererade %{resource_name} nyhetsbrev"
         update: "%{user_name} uppdaterade %{resource_name} nyhetsbrev"
+      oauth_application:
+        create: "%{user_name} skapade OAuth-applikationen %{resource_name}"
+        delete: "%{user_name} raderade OAuth-applikationen %{resource_name}"
+        update: "%{user_name} uppdaterade OAuth-applikationen %{resource_name}"
       organization:
         update: "%{user_name} uppdaterade organisationsinställningarna"
       scope:
@@ -118,6 +128,21 @@ sv:
         name: Foo godkännande
       granted_at: Beviljas vid %{timestamp}
       started_at: Börjat vid %{timestamp}
+    components:
+      dummy:
+        actions:
+          bar: Bar
+          foo: foo
+        name: Dummy Komponent
+        settings:
+          global:
+            comments_enabled: Kommentarer aktiverade
+            dummy_global_attribute_1: Dummy Attribut 1
+            dummy_global_attribute_2: Dummy Attribut 2
+          step:
+            comments_blocked: Kommentarer blockerade
+            dummy_step_attribute_1: Dummy Step Attribut 1
+            dummy_step_attribute_2: Dummy Step Attribut 2
     contact: Kontakt
     core:
       actions:
@@ -128,7 +153,7 @@ sv:
           email_already_exists: Ett annat konto använder samma e-postadress
         new:
           complete_profile: Komplett profil
-          nickname_help: Din korta, unika identifierare i decidim
+          nickname_help: Din korta, unika identifierare i %{organization}
           sign_up: Vänligen fyll i din profil
           subtitle: Vänligen fyll i följande formulär för att slutföra registreringen
           username_help: Offentligt namn som visas på dina inlägg. I syfte att garantera anonymitet kan det vara något namn.
@@ -136,7 +161,7 @@ sv:
         new:
           already_have_an_account?: Har du redan ett konto?
           newsletter: Få ett tillfälligt nyhetsbrev med relevant information
-          nickname_help: Din korta, unika identifierare i decidim
+          nickname_help: Din korta, unika identifierare i %{organization}
           sign_in: Logga in
           sign_up: Registrera
           sign_up_as:
@@ -154,6 +179,21 @@ sv:
       shared:
         omniauth_buttons:
           or: Eller
+    doorkeeper:
+      authorizations:
+        new:
+          authorize: Godkänn ansökan
+          by_organization_link_html: <small class="heading-small">av %{link}</small>
+          cancel: Avbryt
+          connect_your_account_html: Anslut ditt konto genom att logga in på <strong>%{organization}</strong>
+          publish_content: Publicera innehåll för dig
+          see_email: Se din email
+          see_name: Se ditt namn
+          see_username: Se ditt användarnamn
+          this_application_will_be_able_to: 'Denna ansökan kommer att kunna:'
+          this_application_will_not_be_able_to: 'Den här applikationen kommer inte att kunna:'
+          update_profile: Uppdatera din profil
+          wants_to_use_your_account_html: "<strong>%{application_name}</strong> vill använda ditt konto"
     errors:
       internal_server_error:
         title: Det uppstod ett problem med vår server
@@ -169,17 +209,17 @@ sv:
           email_outro: Du har fått den här meddelandet eftersom du följer %{resource_title}. Du kan sluta ta emot meddelanden efter föregående länk.
           email_subject: En uppdatering till %{resource_title}
           notification_title: Ett <a href="%{resource_path}"> nytt dokument</a> har lagts till <a href="%{attached_to_url}">%{resource_title}</a>
+      components:
+        component_published:
+          email_intro: 'Komponenten %{resource_title} är nu aktiv för %{participatory_space_title}. Du kan se den från den här sidan:'
+          email_outro: Du har fått den här meddelandet eftersom du följer %{participatory_space_title}. Du kan sluta ta emot meddelanden efter föregående länk.
+          email_subject: En uppdatering till %{participatory_space_title}
+          notification_title: '%{resource_title} komponenten är nu aktiv för <a href="%{resource_path}">%{participatory_space_title}</a>'
       email_event:
         email_greeting: Hej %{user_name},
         email_intro: 'Det har skett en uppdatering till "%{resource_title}". Du kan se den från den här sidan:'
         email_outro: Du har fått den här meddelandet eftersom du följer "%{resource_title}". Du kan följa det från föregående länk.
         email_subject: En uppdatering till %{resource_title}
-      features:
-        feature_published:
-          email_intro: 'Komponenten %{resource_title} är nu aktiv för %{participatory_space_title}. Du kan se den från den här sidan:'
-          email_outro: Du har fått den här meddelandet eftersom du följer %{participatory_space_title}. Du kan sluta ta emot meddelanden efter föregående länk.
-          email_subject: En uppdatering till %{participatory_space_title}
-          notification_title: '%{resource_title} komponenten är nu aktiv för <a href="%{resource_path}">%{participatory_space_title}</a>'
       notification_event:
         notification_title: En händelse uppstod till <a href="%{resource_path}">%{resource_title}</a>.
       users:
@@ -192,21 +232,6 @@ sv:
       export:
         ready: Vänligen se bifogad en zippad version av din export.
       subject: Din export "%{name}" är klar
-    features:
-      dummy:
-        actions:
-          bar: Bar
-          foo: foo
-        name: Dummy-funktionen
-        settings:
-          global:
-            comments_enabled: Kommentarer aktiverade
-            dummy_global_attribute_1: Dummy Attribut 1
-            dummy_global_attribute_2: Dummy Attribut 2
-          step:
-            comments_blocked: Kommentarer blockerade
-            dummy_step_attribute_1: Dummy Step Attribut 1
-            dummy_step_attribute_2: Dummy Step Attribut 2
     filters:
       linked_classes:
         all: Alla
@@ -242,6 +267,8 @@ sv:
       value_types:
         area_presenter:
           not_found: 'Området hittades inte i databasen (ID: %{id})'
+        area_type_presenter:
+          not_found: 'Områdetypen hittades inte i databasen (ID: %{id})'
         scope_presenter:
           not_found: 'Omfattningen hittades inte i databasen (ID: %{id})'
         scope_type_presenter:
@@ -307,6 +334,10 @@ sv:
     pages:
       index:
         title: Mer information
+    participatory_space_private_users:
+      not_allowed: Du får inte se det här innehållet
+    profile:
+      deleted: Ta bort användare
     profiles:
       default_officialization_text: Denna deltagare är offentligt verifierad, hans / hennes namn eller roll har verifierats för att motsvara hans / hennes riktiga namn och roll
       show:
@@ -394,7 +425,7 @@ sv:
     invitations:
       edit:
         header: Ange ditt lösenord
-        nickname_help: Din unika identifierare i decidim.
+        nickname_help: Din unika identifierare i %{organization}.
         submit_button: Spara
     mailer:
       invitation_instructions:
@@ -404,18 +435,25 @@ sv:
         ignore: |-
           Om du inte vill acceptera inbjudan, ignorerar du detta email.<br /> Ditt konto kommer inte att skapas förrän du öppnar länken ovan och anger ditt lösenord.
         invited_you_as_admin: "%{invited_by} har bjudit in dig som administratör av %{application}. Du kan acceptera det via länken nedan."
+        invited_you_as_private_user: "%{invited_by} har bjudit in dig som privatperson av %{application}. Du kan acceptera det via länken nedan."
         someone_invited_you: Någon har bjudit in dig till %{application}. Du kan acceptera det via länken nedan.
         someone_invited_you_as_admin: Någon har bjudit in dig som administratör av %{application}, du kan acceptera den via länken nedan.
+        someone_invited_you_as_private_user: Någon har bjudit in dig som privat_användare av %{application}, du kan acceptera den via länken nedan.
       invite_admin:
         subject: Du har blivit inbjuden att hantera %{organization}
       invite_collaborator:
         subject: Du har blivit inbjuden att samarbeta på %{organization}
+      invite_private_user:
+        subject: Du har blivit inbjuden till en privat deltagande process på %{organization}
       organization_admin_invitation_instructions:
         subject: Du har blivit inbjuden att hantera %{organization}
       password_change:
         greeting: Hej %{recipient}!
         message: Vi kontaktar dig för att meddela dig att ditt lösenord har ändrats.
         subject: Lösenord ändrat
+  doorkeeper:
+    scopes:
+      public: Din offentliga information.
   errors:
     messages:
       content_type_whitelist_error: Filtypen är inte giltig
@@ -495,6 +533,7 @@ sv:
         answers_count: Avslutade Undersökningar
         assemblies_count: Assemblies
         comments_count: Kommentarer
+        debates_count: Debatter
         endorsements_count: påskrifter
         headline: Aktuellt tillstånd %{organization}
         meetings_count: Möten

data/config/locales/uk.yml

@@ -8,7 +8,6 @@ uk:
       user:
         email: Адреса вашої електронної пошти
         name: Ваше ім’я
-        nickname: Ваш короткий, унікальний псевдонім в Десідім
         password: Новий пароль
         password_confirmation: Підтвердьте свій новий пароль
         remove_avatar: Видалити аватар
@@ -54,9 +53,6 @@ uk:
         success: Вашу обліковку успішно оновлено.
         success_with_email_confirmation: Ваш обліковий запис успішно оновлено. Ви отримаєте електронний лист для підтвердження адреси електронної пошти.
     admin_log:
-      feature:
-        create: "%{user_name} додав складову %{resource_name} до простору %{space_name}"
-        delete: "%{user_name} вилучив складову %{resource_name} з простору %{space_name}"
       moderation:
         hide: "%{user_name} приховав ресурс типу %{resource_type} у просторі %{space_name}"
         unreport: "%{user_name} відкликав скаргу на ресурс типу %{resource_type} у просторі %{space_name}"
@@ -121,7 +117,6 @@ uk:
           email_already_exists: Інший обліковий запис використовує ту ж саму адресу електронної пошти
         new:
           complete_profile: Заповнити профіль
-          nickname_help: Ваш короткий, унікальний псевдонім в Десідім
           sign_up: Будь ласка, заповніть свій профіль
           subtitle: Щоб завершити реєстрацію, заповніть наступну форму
           username_help: Загальнодоступне ім'я, яке відображається у ваших публікаціях. З метою гарантування анонімності, може бути будь-яким.
@@ -129,7 +124,6 @@ uk:
         new:
           already_have_an_account?: Вже маєте обліковий запис?
           newsletter: Отримувати іноді розсилання з цього приводу
-          nickname_help: Ваш короткий, унікальний псевдонім в Десідім
           sign_in: Увійти
           sign_up: Зареєструватися
           sign_up_as:
@@ -179,12 +173,6 @@ uk:
       export:
         ready: Нижче додається стиснута в архів версія вашого збереженого файлу.
       subject: Ваш збережений файл "%{name}" готовий
-    features:
-      dummy:
-        actions:
-          bar: Приклад змінної 1
-          foo: Приклад змінної 2
-        name: Приклад складової
     filters:
       linked_classes:
         all: Усі
@@ -357,7 +345,6 @@ uk:
     invitations:
       edit:
         header: Встановіть свій пароль
-        nickname_help: Ваш унікальний псевдонім в Десідім.
         submit_button: Зберегти
     mailer:
       invitation_instructions:

data/config/routes.rb

@@ -67,5 +67,13 @@ Decidim::Core::Engine.routes.draw do
     get :unsubscribe, on: :collection
   end
 
+  use_doorkeeper do
+    skip_controllers :applications, :authorized_applications
+  end
+
+  scope :oauth do
+    get "/me" => "doorkeeper/credentials#me"
+  end
+
   root to: "pages#show", id: "home"
 end

data/db/migrate/20180206183235_create_participatory_space_private_users.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class CreateParticipatorySpacePrivateUsers < ActiveRecord::Migration[5.1]
+  def change
+    create_table :decidim_participatory_space_private_users do |t|
+      t.references :decidim_user, index: { name: "index_decidim_spaces_users_on_private_user_id" }
+      t.integer :privatable_to_id
+      t.string :privatable_to_type
+
+      t.timestamps
+    end
+
+    add_index(:decidim_participatory_space_private_users, [:privatable_to_type, :privatable_to_id], name: "space_privatable_to_privatable_id")
+  end
+end

data/db/migrate/20180221101934_fix_nickname_index.rb

@@ -6,14 +6,13 @@ class FixNicknameIndex < ActiveRecord::Migration[5.1]
   end
 
   def change
-    Decidim::User.where(nickname: nil)
-                 .where(deleted_at: nil)
-                 .where(managed: false)
-                 .find_each { |u| u.update(nickname: Decidim::User.nicknamize(u.name)) }
+    User.where(nickname: nil)
+        .where(deleted_at: nil)
+        .where(managed: false)
+        .find_each { |u| u.update(nickname: User.nicknamize(u.name)) }
 
     # rubocop:disable Rails/SkipsModelValidations
-    Decidim::User.where(nickname: nil)
-                 .update_all("nickname = ''")
+    User.where(nickname: nil).update_all("nickname = ''")
     # rubocop:enable Rails/SkipsModelValidations
 
     change_column_default :decidim_users, :nickname, ""

data/db/migrate/20180226140756_add_version_to_action_logs.rb

@@ -1,10 +1,14 @@
 # frozen_string_literal: true
 
 class AddVersionToActionLogs < ActiveRecord::Migration[5.1]
+  class ActionLog < ApplicationRecord
+    self.table_name = :decidim_action_logs
+  end
+
   def up
     add_column :decidim_action_logs, :version_id, :integer, index: true
 
-    Decidim::ActionLog.find_each do |action_log|
+    ActionLog.find_each do |action_log|
       version_id = action_log.extra.dig("version", "id")
       next unless version_id
       # rubocop:disable Rails/SkipsModelValidations

data/db/migrate/20180227131727_create_participatory_space_links.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class CreateParticipatorySpaceLinks < ActiveRecord::Migration[5.0]
+  def change
+    create_table :decidim_participatory_space_links do |t|
+      t.references :from, null: false, polymorphic: true, index: { name: "index_participatory_space_links_on_from" }
+      t.references :to, null: false, polymorphic: true, index: { name: "index_participatory_space_links_on_to" }
+      t.string :name, null: false, index: { name: "index_participatory_space_links_name" }
+      t.jsonb :data
+    end
+  end
+end

data/db/migrate/20180305132906_rename_features_to_components.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class RenameFeaturesToComponents < ActiveRecord::Migration[5.1]
+  def change
+    rename_table :decidim_features, :decidim_components
+    rename_column :decidim_action_logs, :decidim_feature_id, :decidim_component_id
+    rename_index :decidim_action_logs, "index_action_logs_on_feature_id", "index_action_logs_on_component_id"
+
+    if index_name_exists?(:decidim_components, "index_decidim_features_on_decidim_participatory_space")
+      rename_index :decidim_components, "index_decidim_features_on_decidim_participatory_space", "index_decidim_components_on_decidim_participatory_space"
+    end
+  end
+end

data/db/migrate/20180308113207_doorkeeper_models.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+class DoorkeeperModels < ActiveRecord::Migration[5.1]
+  def change
+    create_table :oauth_applications do |t|
+      t.string :name, null: false
+      t.string :organization_name, null: false
+      t.string :organization_url, null: false
+      t.string :organization_logo, null: false
+      t.string :uid, null: false
+      t.string :secret, null: false
+      t.text :redirect_uri, null: false
+      t.string :scopes, null: false, default: ""
+      t.references :decidim_organization, foreign_key: true, index: true
+      t.timestamps null: false
+      t.string :type
+    end
+
+    add_index :oauth_applications, :uid, unique: true
+
+    create_table :oauth_access_grants do |t|
+      t.integer :resource_owner_id, null: false
+      t.references :application, null: false
+      t.string :token, null: false
+      t.integer :expires_in, null: false
+      t.text :redirect_uri, null: false
+      t.datetime :created_at, null: false
+      t.datetime :revoked_at
+      t.string :scopes
+    end
+
+    add_index :oauth_access_grants, :token, unique: true
+    add_foreign_key(
+      :oauth_access_grants,
+      :oauth_applications,
+      column: :application_id
+    )
+
+    create_table :oauth_access_tokens do |t|
+      t.integer :resource_owner_id
+      t.references :application
+
+      # If you use a custom token generator you may need to change this column
+      # from string to text, so that it accepts tokens larger than 255
+      # characters. More info on custom token generators in:
+      # https://github.com/doorkeeper-gem/doorkeeper/tree/v3.0.0.rc1#custom-access-token-generator
+      #
+      # t.text     :token,             null: false
+      t.string :token, null: false
+
+      t.string :refresh_token
+      t.integer :expires_in
+      t.datetime :revoked_at
+      t.datetime :created_at, null: false
+      t.string :scopes
+
+      # If there is a previous_refresh_token column,
+      # refresh tokens will be revoked after a related access token is used.
+      # If there is no previous_refresh_token column,
+      # previous tokens are revoked as soon as a new access token is created.
+      # Comment out this line if you'd rather have refresh tokens
+      # instantly revoked.
+      t.string :previous_refresh_token, null: false, default: ""
+    end
+
+    add_index :oauth_access_tokens, :token, unique: true
+    add_index :oauth_access_tokens, :resource_owner_id
+    add_index :oauth_access_tokens, :refresh_token, unique: true
+    add_foreign_key(
+      :oauth_access_tokens,
+      :oauth_applications,
+      column: :application_id
+    )
+    add_foreign_key(
+      :oauth_access_tokens,
+      :decidim_users,
+      column: :resource_owner_id
+    )
+    add_foreign_key(
+      :oauth_access_grants,
+      :decidim_users,
+      column: :resource_owner_id
+    )
+  end
+end

data/db/migrate/20180314085339_rename_maximum_votes_per_proposal_to_threshold_per_proposal.rb

@@ -3,7 +3,7 @@
 class RenameMaximumVotesPerProposalToThresholdPerProposal < ActiveRecord::Migration[5.1]
   def up
     execute <<~SQL
-      UPDATE decidim_features
+      UPDATE decidim_components
       SET settings = jsonb_set(
         settings::jsonb,
         array['global'],
@@ -15,7 +15,7 @@ class RenameMaximumVotesPerProposalToThresholdPerProposal < ActiveRecord::Migrat
 
   def down
     execute <<~SQL
-      UPDATE decidim_features
+      UPDATE decidim_components
       SET settings = jsonb_set(
         settings::jsonb,
         array['global'],

data/db/seeds.rb

@@ -87,7 +87,7 @@ if !Rails.env.production? || ENV["SEED"]
 
   admin.update!(
     name: Faker::Name.name,
-    nickname: Faker::Lorem.unique.characters(rand(1..20)),
+    nickname: Faker::Twitter.unique.screen_name,
     password: "decidim123456",
     password_confirmation: "decidim123456",
     organization: organization,
@@ -103,7 +103,7 @@ if !Rails.env.production? || ENV["SEED"]
 
   regular_user.update!(
     name: Faker::Name.name,
-    nickname: Faker::Lorem.unique.characters(rand(1..20)),
+    nickname: Faker::Twitter.unique.screen_name,
     password: "decidim123456",
     password_confirmation: "decidim123456",
     confirmed_at: Time.current,
@@ -136,4 +136,14 @@ if !Rails.env.production? || ENV["SEED"]
       )
     end
   end
+
+  Decidim::OAuthApplication.create!(
+    name: "Test OAuth application",
+    organization_name: "Example organization",
+    organization_url: "http://www.example.org",
+    organization_logo: File.new(File.join(seeds_root, "homepage_image.jpg")),
+    redirect_uri: "https://www.example.org/oauth/decidim",
+    scopes: "public",
+    organization: organization
+  )
 end

data/lib/decidim/api/attachable_interface.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    # This interface represents a commentable object.
+    AttachableInterface = GraphQL::InterfaceType.define do
+      name "AttachableInterface"
+      description "An interface that can be used in objects with attachments"
+
+      field :attachments, !types[Decidim::Core::AttachmentType], "This object's attachments"
+    end
+  end
+end

data/lib/decidim/api/authorable_interface.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    # This interface represents a commentable object.
+    AuthorableInterface = GraphQL::InterfaceType.define do
+      name "AuthorableInterface"
+      description "An interface that can be used in authorable objects."
+
+      field :author, !Decidim::Core::AuthorInterface, "The comment's author", property: :normalized_author
+    end
+  end
+end

data/lib/decidim/api/categorizable_interface.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    # This interface represents a commentable object.
+    CategorizableInterface = GraphQL::InterfaceType.define do
+      name "CategorizableInterface"
+      description "An interface that can be used in categorizable objects."
+
+      field :category, !Decidim::Core::CategoryType, "The object's category"
+    end
+  end
+end

data/lib/decidim/api/participatory_space_interface.rb

@@ -14,7 +14,7 @@ module Decidim
         description "Lists the components this space contains."
 
         resolve ->(participatory_space, _args, _ctx) {
-                  Decidim::Feature.where(
+                  Decidim::Component.where(
                     participatory_space: participatory_space
                   ).published
                 }
@@ -22,10 +22,10 @@ module Decidim
 
       field :stats, types[Decidim::Core::StatisticType] do
         resolve ->(participatory_space, _args, _ctx) {
-          published_features = Feature.where(participatory_space: participatory_space).published
+          published_components = Component.where(participatory_space: participatory_space).published
 
-          stats = Decidim.feature_manifests.map do |feature_manifest|
-            feature_manifest.stats.with_context(published_features).map { |name, data| [name, data] }.flatten
+          stats = Decidim.component_manifests.map do |component_manifest|
+            component_manifest.stats.with_context(published_components).map { |name, data| [name, data] }.flatten
           end
 
           stats.reject(&:empty?)

data/lib/decidim/api/scopable_interface.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    # This interface represents a commentable object.
+    ScopableInterface = GraphQL::InterfaceType.define do
+      name "ScopableInterface"
+      description "An interface that can be used in scopable objects."
+
+      field :scope, !Decidim::Core::ScopeApiType, "The object's scope"
+    end
+  end
+end

data/lib/decidim/authorable.rb

@@ -20,6 +20,14 @@ module Decidim
         author == user || user.user_groups.include?(user_group)
       end
 
+      # Returns the normalized author, whether it's a user group or a user. Ideally this should be
+      # the *author* method, but it's pending a refactor.
+      #
+      # Returns an Author, a UserGroup or nil.
+      def normalized_author
+        user_group || author
+      end
+
       private
 
       def verified_user_group