decidim-core 0.18.1 → 0.19.0

data/app/helpers/decidim/map_helper.rb

@@ -18,7 +18,7 @@ module Decidim
 
       map_url = "https://www.openstreetmap.org/?mlat=#{latitude}&mlon=#{longitude}#map=#{zoom}/#{latitude}/#{longitude}"
 
-      link_to map_url, target: "_blank" do
+      link_to map_url, target: "_blank", rel: "noopener" do
         image_tag decidim.static_map_path(sgid: resource.to_sgid.to_s)
       end
     end

data/app/helpers/decidim/meta_tags_helper.rb

@@ -36,6 +36,7 @@ module Decidim
     def add_decidim_page_title(title)
       @decidim_page_title ||= []
       return @decidim_page_title if title.blank?
+
       @decidim_page_title << title
     end
 

data/app/helpers/decidim/resource_reference_helper.rb

@@ -12,6 +12,7 @@ module Decidim
     # 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
 

data/app/jobs/decidim/event_publisher_job.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Decidim
+  class EventPublisherJob < ApplicationJob
+    queue_as :events
+
+    attr_reader :resource
+
+    def perform(event_name, data)
+      @resource = data[:resource]
+
+      return unless notifiable?
+
+      EmailNotificationGeneratorJob.perform_later(
+        event_name,
+        data[:event_class],
+        data[:resource],
+        data[:followers],
+        data[:affected_users],
+        data[:extra]
+      )
+
+      NotificationGeneratorJob.perform_later(
+        event_name,
+        data[:event_class],
+        data[:resource],
+        data[:followers],
+        data[:affected_users],
+        data[:extra]
+      )
+    end
+
+    private
+
+    # Whether this event should be notified or not. Useful when you want the
+    # event to decide based on the params.
+    #
+    # It returns false when the resource or any element in the chain is a
+    # `Decidim::Publicable` and it isn't published or participatory_space
+    # is a `Decidim::Participable` and the user can't participate.
+    def notifiable?
+      return false if resource.is_a?(Decidim::Publicable) && !resource.published?
+      return false if participatory_space.is_a?(Decidim::Publicable) && !participatory_space&.published?
+      return false if component && !component.published?
+
+      true
+    end
+
+    def component
+      return resource.component if resource.is_a?(Decidim::HasComponent)
+      return resource if resource.is_a?(Decidim::Component)
+    end
+
+    def participatory_space
+      return resource if resource.is_a?(Decidim::ParticipatorySpaceResourceable)
+
+      component&.participatory_space
+    end
+  end
+end

data/app/jobs/decidim/metric_job.rb

@@ -7,6 +7,7 @@ module Decidim
     def perform(manager_class, organization_id, day = nil)
       organization = Decidim::Organization.find_by(id: organization_id)
       return unless organization
+
       metric = manager_class.constantize.new(day, organization)
       metric.save if metric.valid?
     end

data/app/models/decidim/action_log.rb

@@ -128,5 +128,17 @@ module Decidim
         scope.each { |relation| loader.call(relation.id, relation) }
       end
     end
+
+    # Whether this activity or log is visible for a given user (can also be nil)
+    #
+    # Returns a True/False.
+    def visible_for?(user)
+      return false if resource_lazy.blank?
+      return false if participatory_space_lazy.blank?
+      return false if resource_lazy.respond_to?(:hidden?) && resource_lazy.hidden?
+      return false if resource_lazy.respond_to?(:can_participate?) && !resource_lazy.can_participate?(user)
+
+      true
+    end
   end
 end

data/app/models/decidim/amendment.rb

@@ -2,11 +2,18 @@
 
 module Decidim
   class Amendment < ApplicationRecord
+    STATES = %w(draft evaluating accepted rejected withdrawn).freeze
+
     belongs_to :amendable, foreign_key: "decidim_amendable_id", foreign_type: "decidim_amendable_type", polymorphic: true
     belongs_to :amender, foreign_key: "decidim_user_id", class_name: "Decidim::User"
     belongs_to :emendation, foreign_key: "decidim_emendation_id", foreign_type: "decidim_emendation_type", polymorphic: true
 
-    STATES = %w(evaluating accepted rejected withdrawn).freeze
+    validates :amendable, :amender, :emendation, presence: true
+    validates :state, presence: true, inclusion: { in: STATES }
+
+    def draft?
+      state == "draft"
+    end
 
     def evaluating?
       state == "evaluating"
@@ -16,6 +23,28 @@ module Decidim
       state == "rejected"
     end
 
-    validates :amendable, :amender, :emendation, presence: true
+    def promoted?
+      return false unless rejected?
+
+      emendation.linked_promoted_resource.present?
+    end
+
+    # VisibilityStepSetting::options can be expanded via config setting.
+    #
+    # For new options, add the missing locales in `decidim-core/config/locales/en.yml` and
+    # change the logic of the filtering methods in the Amendable concern to fit your needs:
+    # - Decidim::Amendable::only_visible_emendations_for(user, component)
+    # - Decidim::Amendable::amendables_and_visible_emendations_for(user, component)
+    # - Decidim::Amendable#visible_emendations_for(user)
+    #
+    # Returns an Array of Arrays of translation, value:
+    # i.e. [["All amendments are visible", "all"], ...]
+    class VisibilityStepSetting
+      def self.options
+        Decidim.config.amendments_visibility_options.map do |option|
+          [I18n.t(option, scope: "decidim.amendments.visibility_options"), option]
+        end
+      end
+    end
   end
 end

data/app/models/decidim/attachment.rb

@@ -44,6 +44,7 @@ module Decidim
     # Returns String.
     def thumbnail_url
       return unless photo?
+
       file.thumbnail.url
     end
 
@@ -52,6 +53,7 @@ module Decidim
     # Returns String.
     def big_url
       return unless photo?
+
       file.big.url
     end
   end

data/app/models/decidim/authorization.rb

@@ -53,6 +53,7 @@ module Decidim
     def expires_at
       return unless workflow_manifest
       return if workflow_manifest.expires_in.zero?
+
       (granted_at || created_at) + workflow_manifest.expires_in
     end
 

data/app/models/decidim/category.rb

@@ -44,6 +44,7 @@ module Decidim
 
     def subcategories_have_same_participatory_space
       return unless parent
+
       self.participatory_space = parent.participatory_space
     end
   end

data/app/models/decidim/component.rb

@@ -73,6 +73,13 @@ module Decidim
     # Public: Returns an empty description
     def resource_description; end
 
+    def can_participate_in_space?(user)
+      return true unless participatory_space.try(:private_space?)
+      return false unless user
+
+      participatory_space.can_participate?(user)
+    end
+
     private
 
     def participatory_space_name

data/app/models/decidim/content_block.rb

@@ -66,6 +66,7 @@ module Decidim
     # block manifest.
     def images_container
       return @images_container if @images_container
+
       manifest = self.manifest
 
       @images_container = Class.new do

data/app/models/decidim/follow.rb

@@ -36,17 +36,20 @@ module Decidim
 
     def increase_followers_counter
       return unless followable.is_a?(Decidim::UserBaseEntity)
+
       followable.increment!(:followers_count)
     end
 
     def decrease_following_counters
       return unless user
+
       user.decrement!(:following_count)
     end
 
     def decrease_followers_counter
       return unless followable.is_a?(Decidim::UserBaseEntity)
       return unless user
+
       followable.decrement!(:followers_count)
     end
     # rubocop:enable Rails/SkipsModelValidations

data/app/models/decidim/identity.rb

@@ -25,6 +25,7 @@ module Decidim
 
     def same_organization
       return if organization == user&.organization
+
       errors.add(:organization, :invalid)
     end
   end

data/app/models/decidim/impersonation_log.rb

@@ -25,11 +25,13 @@ module Decidim
 
     def same_organization
       return if admin&.organization == user&.organization
+
       errors.add(:admin, :invalid)
     end
 
     def non_active_impersonation
       return if ended? || expired?
+
       errors.add(:admin, :invalid) if Decidim::ImpersonationLog.where(admin: admin).active.any?
     end
   end

data/app/models/decidim/newsletter.rb

@@ -51,6 +51,7 @@ module Decidim
 
     def author_belongs_to_organization
       return if !author || !organization
+
       errors.add(:author, :invalid) unless author.organization == organization
     end
   end

data/app/models/decidim/participatory_process_user_role.rb

@@ -25,6 +25,7 @@ module Decidim
     # Private: check if the process and the user have the same organization
     def user_and_participatory_process_same_organization
       return if !participatory_process || !user
+
       errors.add(:participatory_process, :invalid) unless user.organization == participatory_process.organization
     end
   end

data/app/models/decidim/participatory_space_private_user.rb

@@ -27,6 +27,7 @@ module Decidim
     # Private: check if the participatory space and the user have the same organization
     def user_and_participatory_space_same_organization
       return if !privatable_to || !user
+
       errors.add(:privatable_to, :invalid) unless user.organization == privatable_to.organization
     end
   end

data/app/models/decidim/permission_action.rb

@@ -23,6 +23,7 @@ module Decidim
 
     def allow!
       raise PermissionCannotBeDisallowedError, "Allowing a previously disallowed action is not permitted: #{inspect}" if @state == :disallowed
+
       @state = :allowed
     end
 
@@ -32,6 +33,7 @@ module Decidim
 
     def allowed?
       raise PermissionNotSetError, "Permission hasn't been allowed or disallowed yet: #{inspect}" if @state.blank?
+
       @state == :allowed
     end
 

data/app/models/decidim/report.rb

@@ -28,6 +28,7 @@ module Decidim
     # Private: check if the moderation and the user have the same organization
     def user_and_moderation_same_organization
       return if !moderation || !user
+
       errors.add(:moderation, :invalid) unless user.organization == moderation.organization
     end
   end

data/app/models/decidim/scope.rb

@@ -73,6 +73,7 @@ module Decidim
 
     def forbid_cycles
       return unless parent
+
       errors.add(:parent_id, :cycle_detected) if parent.part_of.include?(id)
     end
 

data/app/models/decidim/searchable_resource.rb

@@ -16,7 +16,7 @@ module Decidim
   # - datetime:  The timestamp that places this resource in the line of time. Used as second criteria (first is text relevance) for sorting.
   #
   class SearchableResource < ApplicationRecord
-    include PgSearch
+    include PgSearch::Model
 
     belongs_to :organization,
                foreign_key: "decidim_organization_id",

data/app/models/decidim/static_page.rb

@@ -65,6 +65,7 @@ module Decidim
     # set the organization tos_version
     def update_organization_tos_version
       return unless slug == "terms-and-conditions"
+
       organization.update!(tos_version: created_at)
     end
 

data/app/models/decidim/user.rb

@@ -182,6 +182,7 @@ module Decidim
     # If the user has been deleted or it is managed the email field is not required anymore.
     def email_required?
       return false if deleted? || managed?
+
       super
     end
 
@@ -189,6 +190,7 @@ module Decidim
     # If the user is managed the password field is not required anymore.
     def password_required?
       return false if managed?
+
       super
     end
 

data/app/permissions/decidim/permissions.rb

@@ -11,8 +11,8 @@ module Decidim
       search_scope_action?
 
       return permission_action unless user
-      return user_manager_permissions if not_admin? && user_manager?
 
+      user_manager_permissions
       manage_self_user_action?
       authorization_action?
       follow_action?
@@ -30,11 +30,13 @@ module Decidim
     def read_public_pages_action?
       return unless permission_action.subject == :public_page &&
                     permission_action.action == :read
+
       allow!
     end
 
     def locales_action?
       return unless permission_action.subject == :locales
+
       allow!
     end
 
@@ -45,21 +47,25 @@ module Decidim
       return allow! if component.published?
       return allow! if user_can_admin_component?
       return allow! if user_can_admin_component_via_space?
+
       disallow!
     end
 
     def search_scope_action?
       return unless permission_action.subject == :scope
+
       toggle_allow([:search, :pick].include?(permission_action.action))
     end
 
     def manage_self_user_action?
       return unless permission_action.subject == :user
+
       toggle_allow(context.fetch(:current_user, nil) == user)
     end
 
     def authorization_action?
       return unless permission_action.subject == :authorization
+
       authorization = context.fetch(:authorization, nil)
 
       case permission_action.action
@@ -82,10 +88,17 @@ module Decidim
 
     def amend_action?
       return unless permission_action.subject == :amendment
-      return allow! if permission_action.action == :create
-      return allow! if permission_action.action == :reject
-      return allow! if permission_action.action == :promote
-      return allow! if permission_action.action == :accept
+      return disallow! unless component.settings.amendments_enabled
+
+      case permission_action.action
+      when :create
+        return allow! if component.current_settings.amendment_creation_enabled
+      when :accept,
+          :reject
+        return allow! if component.current_settings.amendment_reaction_enabled
+      when :promote
+        return allow! if component.current_settings.amendment_promotion_enabled
+      end
 
       amendment = context.fetch(:amendment, nil)
       toggle_allow(amendment&.amender == user)
@@ -158,14 +171,5 @@ module Decidim
     def user_manager_permissions
       Decidim::UserManagerPermissions.new(user, permission_action, context).permissions
     end
-
-    def not_admin?
-      !user.admin?
-    end
-
-    # Whether the user has the user_manager role or not.
-    def user_manager?
-      user.role? "user_manager"
-    end
   end
 end