decidim-core 0.13.1 → 0.14.1

data/app/helpers/decidim/resource_helper.rb

@@ -45,7 +45,7 @@ module Decidim
       return [] unless klass.respond_to?(:linked_classes_for)
 
       klass.linked_classes_for(current_component).map do |k|
-        [k.underscore, t(k.demodulize.downcase, scope: "decidim.filters.linked_classes")]
+        [k.underscore, t(k.demodulize.underscore, scope: "decidim.filters.linked_classes")]
       end
     end
 
@@ -69,5 +69,12 @@ module Decidim
     def resource_locator(resource)
       ::Decidim::ResourceLocatorPresenter.new(resource)
     end
+
+    # Returns a descriptive title for the resource
+    def resource_title(resource)
+      title = resource.try(:title) || resource.try(:name) || resource.try(:subject) || "#{resource.model_name.human} ##{resource.id}"
+      title = translated_attribute(title) if title.is_a?(Hash)
+      title
+    end
   end
 end

data/app/helpers/decidim/searches_helper.rb

@@ -1,15 +1,16 @@
 # frozen_string_literal: true
 
 module Decidim
-  # A Helper to render and link to resources.
+  # A Helper to render and link to searchables.
   module SearchesHelper
-    def searchable_resource_human_name(resource)
-      resource.model_name.human.pluralize
+    # @param count: (optional) the number of resources so that the I18n backend can decide to translate into singluar or plural form.
+    def searchable_resource_human_name(resource, count: 1)
+      resource.model_name.human(count: count)
     end
 
     def searchable_resources_as_options(all_label)
       [["", all_label]] + Decidim::Searchable.searchable_resources.values.collect do |r|
-        [r.name, searchable_resource_human_name(r)]
+        [r.name, searchable_resource_human_name(r, count: 2)]
       end.sort
     end
   end

data/app/helpers/decidim/traceability_helper.rb

@@ -31,7 +31,11 @@ module Decidim
 
     # Caches a DiffRenderer instance for the `current_version`.
     def diff_renderer
-      @diff_renderer ||= Decidim::Accountability::DiffRenderer.new(current_version)
+      @diff_renderer ||= if current_version.item_type.include? "Decidim::Proposals"
+                           Decidim::Proposals::DiffRenderer.new(current_version)
+                         elsif current_version.item_type.include? "Decidim::Accountability"
+                           Decidim::Accountability::DiffRenderer.new(current_version)
+                         end
     end
 
     # Renders the diff between `:old_data` and `:new_data` keys in the `data` param.

data/app/models/decidim/authorization.rb

@@ -39,7 +39,7 @@ module Decidim
     def grant!
       remove_verification_attachment!
 
-      update!(granted_at: Time.zone.now, verification_metadata: {})
+      update!(granted_at: Time.current, verification_metadata: {})
     end
 
     def granted?
@@ -57,7 +57,7 @@ module Decidim
     end
 
     def expired?
-      expires_at.present? && expires_at < Time.zone.now
+      expires_at.present? && expires_at < Time.current
     end
 
     private

data/app/models/decidim/content_block.rb

@@ -0,0 +1,144 @@
+# frozen_string_literal: true
+
+module Decidim
+  # this class represents a content block manifest instance in the DB. Check the
+  # docs on `ContentBlockRegistry` and `ContentBlockManifest` for more info.
+  class ContentBlock < ApplicationRecord
+    include Publicable
+
+    belongs_to :organization, foreign_key: :decidim_organization_id, class_name: "Decidim::Organization"
+
+    delegate :public_name_key, :has_settings?, :settings_form_cell, :cell, to: :manifest
+
+    before_save :save_images
+    after_save :reload_images
+
+    # Public: finds the published content blocks for the given scope and
+    # organization. Returns them ordered by ascending weight (lowest first).
+    def self.for_scope(scope, organization:)
+      where(organization: organization, scope: scope)
+        .order(weight: :asc)
+    end
+
+    def manifest
+      @manifest ||= Decidim.content_blocks.for(scope).find { |manifest| manifest.name.to_s == manifest_name }
+    end
+
+    # Public: Uses the `SettingsManifest` class to generate a settings schema
+    # and fill it with the content blocks current settings. This eases the
+    # access to those settings values.
+    #
+    # Returns an object that responds to the settings defined in the content
+    # block manifest.
+    def settings
+      manifest.settings.schema.new(self[:settings])
+    end
+
+    def reload(*)
+      @images_container = nil
+      super
+    end
+
+    # Public: Holds access to the images related to the content block. This
+    # method generates a dynamic class that encapsulates the uploaders for the
+    # content block images, and eases the access to them. It's a little bit
+    # hacky, but it's the only way I could come up with in order to let content
+    # block images have different uploaders.
+    #
+    # Examples:
+    #
+    #     # This will process the image with the uploader defined at the
+    #     # manifest, upload it and save the record.
+    #     content_block.images_container.my_image = params[:my_image]
+    #     content_block.save!
+    #
+    #     # This is how you can access the image data, just like with any other
+    #     # uploader field. You can use the uploader versions too.
+    #     content_block.images_container.my_image.url
+    #     content_block.images_container.my_image.big.url
+    #     content_block.save!
+    #
+    #     # This will delete the attached image
+    #     content_block.images_container.my_image = nil
+    #     content_block.save!
+    #
+    # Returns an object that responds to the image names defined in the content
+    # block manifest.
+    def images_container
+      return @images_container if @images_container
+      manifest = self.manifest
+
+      @images_container = Class.new do
+        extend ::CarrierWave::Mount
+        include ActiveModel::Validations
+
+        cattr_accessor :manifest, :manifest_scope
+        attr_reader :content_block
+
+        # Needed to calculate uploads URLs
+        delegate :id, to: :content_block
+
+        # Needed to customize the upload URL
+        def self.name
+          to_s.camelize
+        end
+
+        # Needed to customize the upload URL
+        def self.to_s
+          "decidim/#{manifest.name.to_s.underscore}_#{manifest_scope.to_s.underscore}_content_block"
+        end
+
+        def initialize(content_block)
+          @content_block = content_block
+        end
+
+        def manifest
+          self.class.manifest
+        end
+
+        manifest.images.each do |image_config|
+          mount_uploader image_config[:name], image_config[:uploader].constantize
+        end
+
+        # This is used to access the upload file name from the container, given
+        # an image name.
+        def read_uploader(column)
+          content_block.images[column.to_s]
+        end
+
+        # This is used to set the upload file name from the container, given
+        # an image name.
+        def write_uploader(column, value)
+          content_block.images[column.to_s] = value
+        end
+
+        # When we save the content block, we force the container to save itself
+        # too, so images can be processed, uploaded and stored in the DB.
+        def save
+          manifest.images.each do |image_config|
+            send(:"write_#{image_config[:name]}_identifier")
+            send(:"store_#{image_config[:name]}!")
+          end
+        end
+      end
+
+      @images_container.manifest = manifest
+      @images_container.manifest_scope = scope
+      @images_container = @images_container.new(self)
+    end
+
+    private
+
+    # Internal: Since we're using the `images_container` hack to hold the
+    # uploaders, we need to manually trigger it to save the attached images.
+    def save_images
+      images_container.save
+    end
+
+    # On instance reloading we need to remove the `images_cointainer` cached
+    # class so it gets regenerated with the new values.
+    def reload_images
+      @images_container = nil
+    end
+  end
+end

data/app/models/decidim/gamification/badge_score.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Gamification
+    class BadgeScore < ApplicationRecord
+      self.table_name = "decidim_gamification_badge_scores"
+
+      belongs_to :user, class_name: "Decidim::User"
+      validates :user, presence: true
+      validates :value, numericality: { greater_than_or_equal_to: 0 }
+    end
+  end
+end

data/app/models/decidim/messaging/message.rb

@@ -38,7 +38,7 @@ module Decidim
       # @param recipients [Array<Decidim::User>]
       #
       def envelope_for(recipients)
-        receipts.build(recipient: sender, read_at: Time.zone.now)
+        receipts.build(recipient: sender, read_at: Time.current)
 
         recipients.each { |recipient| receipts.build(recipient: recipient) }
       end

data/app/models/decidim/messaging/receipt.rb

@@ -19,7 +19,7 @@ module Decidim
 
       # rubocop:disable Rails/SkipsModelValidations
       def self.mark_as_read(user)
-        recipient(user).update_all(read_at: Time.zone.now)
+        recipient(user).update_all(read_at: Time.current)
       end
       # rubocop:enable Rails/SkipsModelValidations
     end

data/app/models/decidim/organization.rb

@@ -19,12 +19,12 @@ module Decidim
     has_many :users_with_any_role, -> { where.not(roles: []) }, foreign_key: "decidim_organization_id", class_name: "Decidim::User"
     has_many :users, foreign_key: "decidim_organization_id", class_name: "Decidim::User", dependent: :destroy
     has_many :oauth_applications, foreign_key: "decidim_organization_id", class_name: "Decidim::OAuthApplication", inverse_of: :organization, dependent: :destroy
+    has_many :hashtags, foreign_key: "decidim_organization_id", class_name: "Decidim::Hashtag", dependent: :destroy
 
     validates :name, :host, uniqueness: true
     validates :reference_prefix, presence: true
     validates :default_locale, inclusion: { in: :available_locales }
 
-    mount_uploader :homepage_image, Decidim::HomepageImageUploader
     mount_uploader :official_img_header, Decidim::OfficialImageHeaderUploader
     mount_uploader :official_img_footer, Decidim::OfficialImageFooterUploader
     mount_uploader :logo, Decidim::OrganizationLogoUploader
@@ -46,10 +46,6 @@ module Decidim
       @top_scopes ||= scopes.top_level
     end
 
-    def homepage_big_url
-      homepage_image.big.url
-    end
-
     def public_participatory_spaces
       @public_participatory_spaces ||= Decidim.participatory_space_manifests.flat_map do |manifest|
         manifest.participatory_spaces.call(self).public_spaces

data/app/models/decidim/resource_permission.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A ResourcePermission allows to override component permissions for an specific resource.
+  class ResourcePermission < ApplicationRecord
+    belongs_to :resource, polymorphic: true
+  end
+end

data/app/models/decidim/searchable_resource.rb

@@ -26,7 +26,7 @@ module Decidim
                class_name: "Decidim::Scope",
                optional: true
     belongs_to :resource, polymorphic: true
-    belongs_to :decidim_participatory_space, polymorphic: true
+    belongs_to :decidim_participatory_space, polymorphic: true, optional: true
 
     validates :locale, uniqueness: { scope: :resource }
 

data/app/models/decidim/user.rb

@@ -12,6 +12,7 @@ module Decidim
     include Decidim::Followable
     include Decidim::Loggable
     include Decidim::DataPortability
+    include Decidim::Searchable
 
     OMNIAUTH_PROVIDERS = [:facebook, :twitter, :google_oauth2, (:developer if Rails.env.development?)].compact
     ROLES = %w(admin user_manager).freeze
@@ -54,6 +55,15 @@ module Decidim
 
     attr_accessor :newsletter_notifications
 
+    searchable_fields({
+                        # scope_id: :decidim_scope_id,
+                        organization_id: :decidim_organization_id,
+                        A: :name,
+                        datetime: :created_at
+                      },
+                      index_on_create: ->(user) { !user.deleted? },
+                      index_on_update: ->(user) { !user.deleted? })
+
     def user_invited?
       invitation_token_changed? && invitation_accepted_at_changed?
     end
@@ -124,6 +134,12 @@ module Decidim
                      end
     end
 
+    def following_users
+      @following_users ||= following.select do |f|
+        f.is_a?(Decidim::User)
+      end
+    end
+
     def unread_conversations
       Decidim::Messaging::Conversation.unread_by(self)
     end
@@ -155,7 +171,7 @@ module Decidim
     end
 
     def tos_accepted?
-      return true if managed
+      return true if managed || organization.tos_version.nil?
       return false if accepted_tos_version.nil?
       accepted_tos_version >= organization.tos_version
     end

data/app/permissions/decidim/default_permissions.rb

@@ -38,10 +38,11 @@ module Decidim
         [:participatory_space, :component].include?(permission_action.subject)
     end
 
-    def authorized?(permission_action)
-      return unless component
+    def authorized?(permission_action, resource: nil)
+      return unless resource || component
+      return if component && resource && component != resource.component
 
-      ActionAuthorizer.new(user, component, permission_action).authorize.ok?
+      ActionAuthorizer.new(user, permission_action, component, resource).authorize.ok?
     end
 
     def current_settings

data/app/permissions/decidim/permissions.rb

@@ -3,6 +3,8 @@
 module Decidim
   class Permissions < DefaultPermissions
     def permissions
+      return permission_action unless permission_action.scope == :public
+
       read_public_pages_action?
       locales_action?
       component_public_action?
@@ -37,7 +39,10 @@ module Decidim
       return unless permission_action.subject == :component &&
                     permission_action.action == :read
 
-      toggle_allow(component.published?)
+      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?
@@ -86,6 +91,33 @@ module Decidim
       toggle_allow(conversation.participants.include?(user))
     end
 
+    def user_can_admin_component?
+      new_permission_action = Decidim::PermissionAction.new(
+        action: permission_action.action,
+        scope: :admin,
+        subject: permission_action.subject
+      )
+      Decidim::Admin::Permissions.new(user, new_permission_action, context).permissions.allowed?
+    rescue Decidim::PermissionAction::PermissionNotSetError
+      nil
+    end
+
+    def user_can_admin_component_via_space?
+      Decidim.participatory_space_manifests.any? do |manifest|
+        begin
+          new_permission_action = Decidim::PermissionAction.new(
+            action: permission_action.action,
+            scope: :admin,
+            subject: permission_action.subject
+          )
+          new_context = context.merge(current_participatory_space: component.participatory_space)
+          manifest.permissions_class.new(user, new_permission_action, new_context).permissions.allowed?
+        rescue Decidim::PermissionAction::PermissionNotSetError
+          nil
+        end
+      end
+    end
+
     def not_already_active?(authorization)
       Verifications::Authorizations.new(organization: user.organization, user: user, name: authorization.name).none?
     end

data/app/presenters/decidim/hashtag_presenter.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Decidim
+  #
+  # Decorator for users
+  #
+  class HashtagPresenter < SimpleDelegator
+    include Rails.application.routes.mounted_helpers
+    include ActionView::Helpers::UrlHelper
+
+    #
+    # name presented in a twitter-like style
+    #
+    def name
+      "##{super}"
+    end
+
+    delegate :url, to: :hashtag, prefix: true
+
+    def hashtag_path
+      decidim.hashtag_path(__getobj__.name)
+    end
+
+    def display_hashtag
+      link_to name, decidim.search_path(term: name), target: "_blank", class: "hashtag-mention"
+    end
+
+    def display_hashtag_name
+      name
+    end
+  end
+end