decidim-core 0.9.3 → 0.10.0

data/app/commands/decidim/create_report.rb

@@ -57,7 +57,7 @@ module Decidim
     end
 
     def update_report_count!
-      @moderation.update_attributes!(report_count: @moderation.report_count + 1)
+      @moderation.update!(report_count: @moderation.report_count + 1)
     end
 
     def participatory_space_admins
@@ -75,7 +75,7 @@ module Decidim
     end
 
     def hide!
-      Decidim::Admin::HideResource.new(@reportable).call
+      Decidim::Admin::HideResource.new(@reportable, @current_user).call
     end
 
     def send_hide_notification_to_admins

data/app/controllers/decidim/devise/invitations_controller.rb

@@ -24,7 +24,7 @@ module Decidim
       # When a managed user accepts the invitation is promoted to non-managed user.
       def accept_resource
         resource = resource_class.accept_invitation!(update_resource_params)
-        resource.update_attributes!(managed: false) if resource.managed?
+        resource.update!(managed: false) if resource.managed?
         resource
       end
 

data/app/controllers/decidim/features/base_controller.rb

@@ -14,7 +14,7 @@ module Decidim
 
       helper Decidim::FiltersHelper
       helper Decidim::OrdersHelper
-      helper Decidim::FeatureReferenceHelper
+      helper Decidim::ResourceReferenceHelper
       helper Decidim::TranslationsHelper
       helper Decidim::IconHelper
       helper Decidim::ResourceHelper

data/app/controllers/decidim/locales_controller.rb

@@ -7,7 +7,7 @@ module Decidim
     authorize_resource :locales, class: false
 
     def create
-      current_user.update_attributes!(locale: params["locale"]) if current_user && params["locale"] && available_locales.include?(params["locale"])
+      current_user.update!(locale: params["locale"]) if current_user && params["locale"] && available_locales.include?(params["locale"])
 
       redirect_to referer_with_new_locale
     end

data/app/forms/decidim/registration_form.rb

@@ -21,7 +21,7 @@ module Decidim
     validates :sign_up_as, inclusion: { in: %w(user user_group) }
     validates :name, presence: true
     validates :nickname, presence: true
-    validates :email, presence: true
+    validates :email, presence: true, 'valid_email_2/email': { disposable: true }
     validates :password, presence: true, confirmation: true, length: { in: Decidim::User.password_length }
     validates :tos_agreement, allow_nil: false, acceptance: true
 

data/app/helpers/decidim/decidim_form_helper.rb

@@ -34,7 +34,7 @@ module Decidim
     #                      or 'full' (optional) (default: 'basic')
     #           :lines   - The Integer to indicate how many lines should editor have (optional)
     #
-    # Returns a rich editor to be included in a html template.
+    # Returns a rich editor to be included in an html template.
     def editor_field_tag(name, value, options = {})
       options[:toolbar] ||= "basic"
       options[:lines] ||= 10
@@ -50,6 +50,31 @@ module Decidim
       end
     end
 
+    # A custom helper to include a scope picker field without requiring a form
+    # object
+    #
+    # name - The input name
+    # value - The input value as a scope id
+    # options - The set of options to send to the field
+    #           :id - The id to generate for the element (optional)
+    #
+    # Returns a scopes picker tag to be included in an html template.
+    def scopes_picker_field_tag(name, value, id: nil)
+      picker_options = {
+        id: id || sanitize_to_id(name),
+        class: "picker-single",
+        name: name
+      }
+
+      prompt_params = yield(nil)
+      selected_scopes = value ? Decidim::Scope.where(id: value) : []
+      scopes = selected_scopes.map { |scope| [scope, yield(scope)] }
+
+      template = ""
+      template += render("decidim/scopes/scopes_picker_input", picker_options: picker_options, prompt_params: prompt_params, scopes: scopes)
+      template.html_safe
+    end
+
     # A custom helper to include a translated field without requiring a form object.
     #
     # type        - The type of the translated input field.

data/app/helpers/decidim/meta_tags_helper.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+# rubocop:disable Naming/MemoizedInstanceVariableName
 module Decidim
   # Helper that provides convenient methods to deal with the page meta tags.
   module MetaTagsHelper
@@ -103,3 +104,4 @@ module Decidim
     end
   end
 end
+# rubocop:enable Naming/MemoizedInstanceVariableName

data/app/helpers/decidim/resource_reference_helper.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Helper to print resource references.
+  module ResourceReferenceHelper
+    # Displays the localized reference for the given resource.
+    #
+    # resource - the Resource that has the reference to display.
+    # options - An optional hash of options
+    #         * class: A string of extra css classes
+    #
+    # Returns a String.
+    def resource_reference(resource, options = {})
+      return unless resource.respond_to?(:reference) && resource.reference.present?
+      "<div class='tech-info #{options[:class]}'>#{localized_reference(resource.reference)}</div>".html_safe
+    end
+
+    private
+
+    def localized_reference(reference)
+      I18n.t("reference", reference: reference, scope: "decidim.shared.reference")
+    end
+  end
+end

data/app/helpers/decidim/scopes_helper.rb

@@ -3,6 +3,9 @@
 module Decidim
   # A Helper to render scopes, including a global scope, for forms.
   module ScopesHelper
+    include DecidimFormHelper
+    include TranslatableAttributes
+
     Option = Struct.new(:id, :name)
 
     # Checks if the resource should show its scope or not.
@@ -10,7 +13,7 @@ module Decidim
     #
     # Returns boolean.
     def has_visible_scopes?(resource)
-      try(:current_participatory_space)&.try(:scopes_enabled?) && resource.scope.present? && current_participatory_space.try(:scope)&.id != resource.scope&.id
+      resource.participatory_space.scopes_enabled? && resource.scope.present? && resource.participatory_space.scope != resource.scope
     end
 
     # Retrieves the translated name and type for an scope.
@@ -33,14 +36,29 @@ module Decidim
     # name - attribute name
     #
     # Returns nothing.
-    def scopes_picker_field(form, name, root: false)
-      root = try(:current_participatory_space)&.scope if root == false
-      form.scopes_picker name do |scope|
+    def scopes_picker_field(form, name, root: false, options: {})
+      root = current_participatory_space.scope if root == false
+      form.scopes_picker name, options do |scope|
         { url: decidim.scopes_picker_path(root: root, current: scope&.id, field: form.label_for(name)),
           text: scope_name_for_picker(scope, I18n.t("decidim.scopes.global")) }
       end
     end
 
+    # Renders a scopes picker field in a form, not linked to a specific model.
+    # name - name for the input
+    # value - value for the input
+    #
+    # Returns nothing.
+    def scopes_picker_tag(name, value, options = {})
+      root = try(:current_participatory_space)&.scope
+      field = options[:field] || name
+
+      scopes_picker_field_tag name, value, id: options[:id] do |scope|
+        { url: decidim.scopes_picker_path(root: root, current: scope&.id, field: field),
+          text: scope_name_for_picker(scope, I18n.t("decidim.scopes.global")) }
+      end
+    end
+
     # Renders a scopes picker field in a filter form.
     # form - FilterFormBuilder object
     # name - attribute name

data/app/helpers/decidim/view_hooks_helper.rb

@@ -5,11 +5,14 @@ module Decidim
   module ViewHooksHelper
     # Public: Renders all hooks registered as `hook_name`.
     #
-    # hook_name - a Symbol representing the name of the hook.
+    #   Note: We're passing a deep copy of the view context to allow
+    #   us to extend it without polluting the original view context
     #
-    # Returns an HTML safe String.
+    # @param hook_name [Symbol] representing the name of the hook.
+    #
+    # @return [String] an HTML safe String
     def render_hook(hook_name)
-      Decidim.view_hooks.render(hook_name, self)
+      Decidim.view_hooks.render(hook_name, deep_dup)
     end
   end
 end

data/app/mailers/decidim/messaging/conversation_mailer.rb

@@ -25,6 +25,7 @@ module Decidim
 
       private
 
+      # rubocop:disable Naming/UncommunicativeMethodParamName
       def notification_mail(from:, to:, conversation:, action:)
         with_user(to) do
           @organization = to.organization
@@ -42,6 +43,7 @@ module Decidim
           mail(to: to.email, subject: subject)
         end
       end
+      # rubocop:enable Naming/UncommunicativeMethodParamName
     end
   end
 end

data/app/models/decidim/abilities/base_ability.rb

@@ -49,7 +49,7 @@ module Decidim
       private
 
       def not_already_active?(user, authorization)
-        Verifications::Authorizations.new(user: user, name: authorization.name).none?
+        Verifications::Authorizations.new(organization: user.organization, user: user, name: authorization.name).none?
       end
     end
   end

data/app/models/decidim/action_log.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This class represents an action of a user on a resource. It is used
+  # for transparency reasons, to log all actions so all other users can
+  # see the actions being performed.
+  class ActionLog < ApplicationRecord
+    belongs_to :organization,
+               foreign_key: :decidim_organization_id,
+               class_name: "Decidim::Organization"
+
+    belongs_to :user,
+               foreign_key: :decidim_user_id,
+               class_name: "Decidim::User"
+
+    belongs_to :feature,
+               foreign_key: :decidim_feature_id,
+               optional: true,
+               class_name: "Decidim::Feature"
+
+    belongs_to :resource,
+               polymorphic: true
+
+    belongs_to :participatory_space,
+               optional: true,
+               polymorphic: true
+
+    belongs_to :version,
+               optional: true,
+               class_name: "PaperTrail::Version"
+
+    validates :organization, :user, :action, :resource, presence: true
+
+    # To ensure records can't be deleted
+    before_destroy { |_record| raise ActiveRecord::ReadOnlyRecord }
+
+    # Overwrites the method so that records cannot be modified.
+    #
+    # Returns a Boolean.
+    def readonly?
+      !new_record?
+    end
+
+    # Public: Finds the correct presenter class for the given
+    # `log_type` and the related `resource_type`. If no specific
+    # presenter can be found, it falls back to `Decidim::Log::BasePresenter`
+    #
+    # log_type - a Symbol representing the log
+    #
+    # Returns a Class.
+    def log_presenter_class_for(log_type)
+      resource_type.constantize.log_presenter_class_for(log_type)
+    rescue NameError
+      Decidim::Log::BasePresenter
+    end
+  end
+end

data/app/models/decidim/area.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Areas are used in Assemblies to help users know which is
+  # the Area of a participatory space.
+  class Area < ApplicationRecord
+    belongs_to :organization,
+               foreign_key: "decidim_organization_id",
+               class_name: "Decidim::Organization",
+               inverse_of: :areas
+
+    belongs_to :area_type,
+               foreign_key: "area_type_id",
+               class_name: "Decidim::AreaType",
+               inverse_of: :areas,
+               optional: true
+
+    validates :name, :organization, presence: true
+    validates :name, uniqueness: { scope: :organization }
+
+    def translated_name
+      Decidim::AreaPresenter.new(self).translated_name
+    end
+  end
+end

data/app/models/decidim/area_type.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Area types allows to use different types of areas in participatory space
+  # (terriotrial, sectorial, etc.)
+  class AreaType < ApplicationRecord
+    belongs_to :organization,
+               foreign_key: "decidim_organization_id",
+               class_name: "Decidim::Organization",
+               inverse_of: :area_types
+
+    has_many :areas, foreign_key: "area_type_id", class_name: "Decidim::Area", inverse_of: :area_type, dependent: :nullify
+
+    validates :name, presence: true
+
+    def translated_name
+      Decidim::AreaTypePresenter.new(self).translated_name
+    end
+  end
+end

data/app/models/decidim/attachment.rb

@@ -4,12 +4,15 @@ module Decidim
   # Attachment can be any type of document or images related to a partcipatory
   # process.
   class Attachment < ApplicationRecord
+    belongs_to :attachment_collection, class_name: "Decidim::AttachmentCollection", optional: true
     belongs_to :attached_to, polymorphic: true
 
     validates :file, :content_type, presence: true
     validates :file, file_size: { less_than_or_equal_to: ->(_attachment) { Decidim.maximum_attachment_size } }
     mount_uploader :file, Decidim::AttachmentUploader
 
+    default_scope { order(arel_table[:weight].asc) }
+
     # Whether this attachment is a photo or not.
     #
     # Returns Boolean.

data/app/models/decidim/attachment_collection.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Categories serve as a taxonomy for attachments to use for while in the
+  # context of a participatory space.
+  class AttachmentCollection < ApplicationRecord
+    belongs_to :collection_for, polymorphic: true
+    has_many :attachments, foreign_key: "attachment_collection_id", class_name: "Decidim::Attachment", dependent: :nullify
+
+    default_scope { order(arel_table[:weight].asc) }
+
+    def unused?
+      attachments.empty?
+    end
+  end
+end

data/app/models/decidim/authorization.rb

@@ -14,6 +14,7 @@ module Decidim
     mount_uploader :verification_attachment, Decidim::Verifications::AttachmentUploader
 
     belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User"
+    has_one :organization, through: :user, class_name: "Decidim::Organization"
 
     validates :name, uniqueness: { scope: :decidim_user_id }
     validates :verification_metadata, absence: true, if: :granted?

data/app/models/decidim/categorization.rb

@@ -2,6 +2,8 @@
 
 module Decidim
   class Categorization < ApplicationRecord
+    include Decidim::Traceable
+
     belongs_to :category, foreign_key: :decidim_category_id
     belongs_to :categorizable, polymorphic: true
   end

data/app/models/decidim/category.rb

@@ -20,6 +20,14 @@ module Decidim
       where(parent_id: nil)
     end
 
+    def descendants
+      @descendants ||= Category.where(parent_id: id)
+    end
+
+    def translated_name
+      Decidim::CategoryPresenter.new(self).translated_name
+    end
+
     def unused?
       categorizations.empty?
     end

data/app/models/decidim/feature.rb

@@ -7,13 +7,18 @@ module Decidim
   class Feature < ApplicationRecord
     include HasSettings
     include Publicable
+    include Traceable
+    include Loggable
 
     belongs_to :participatory_space, polymorphic: true
 
     default_scope { order(arel_table[:weight].asc) }
 
     delegate :organization, :categories, to: :participatory_space
-    delegate :scopes, to: :organization
+
+    def self.log_presenter_class_for(_log)
+      Decidim::AdminLog::FeaturePresenter
+    end
 
     # Public: Finds the manifest this feature is associated to.
     #

data/app/models/decidim/moderation.rb

@@ -3,10 +3,17 @@
 module Decidim
   # A moderation belongs to a reportable and includes many reports
   class Moderation < ApplicationRecord
+    include Traceable
+    include Loggable
+
     belongs_to :reportable, foreign_key: "decidim_reportable_id", foreign_type: "decidim_reportable_type", polymorphic: true
     belongs_to :participatory_space, foreign_key: "decidim_participatory_space_id", foreign_type: "decidim_participatory_space_type", polymorphic: true
     has_many :reports, foreign_key: "decidim_moderation_id", class_name: "Decidim::Report", dependent: :destroy
 
     delegate :feature, :organization, to: :reportable
+
+    def self.log_presenter_class_for(_log)
+      Decidim::AdminLog::ModerationPresenter
+    end
   end
 end