decidim-core 0.22.0 → 0.23.3

data/app/commands/decidim/gallery_methods.rb

@@ -6,15 +6,15 @@ module Decidim
   module GalleryMethods
     private
 
-    def build_gallery
+    def build_gallery(attached_to = nil)
       @gallery = []
       @form.add_photos.each do |photo|
         next unless image? photo
 
         @gallery << Attachment.new(
-          title: photo.original_filename,
-          file: photo,
-          attached_to: @attached_to
+          title: { I18n.locale => photo.original_filename },
+          attached_to: attached_to || gallery_attached_to,
+          file: photo # Define attached_to before this
         )
       end
     end
@@ -26,7 +26,7 @@ module Decidim
     end
 
     def gallery_invalid?
-      gallery.each do |photo|
+      @gallery.each do |photo|
         if photo.invalid? && photo.errors.has_key?(:file)
           @form.errors.add(:add_photos, photo.errors[:file])
           return true
@@ -37,19 +37,19 @@ module Decidim
 
     def create_gallery
       @gallery.map! do |photo|
-        photo.attached_to = @attached_to
+        photo.attached_to = gallery_attached_to
         photo.save!
         @form.photos << photo.id.to_s
       end
     end
 
     def photo_cleanup!
-      @attached_to.photos.each do |photo|
+      gallery_attached_to.photos.each do |photo|
         photo.destroy! if @form.photos.exclude? photo.id.to_s
       end
       # manually reset cached photos
-      @attached_to.reload
-      @attached_to.instance_variable_set(:@photos, nil)
+      gallery_attached_to.reload
+      gallery_attached_to.instance_variable_set(:@photos, nil)
     end
 
     # maybe a custom settings options would be nice
@@ -60,5 +60,12 @@ module Decidim
     def process_gallery?
       gallery_allowed? && @form.add_photos.any?
     end
+
+    def gallery_attached_to
+      return @attached_to if @attached_to.present?
+      return form.current_organization if form.respond_to?(:current_organization)
+
+      form.current_component.organization if form.respond_to?(:current_component)
+    end
   end
 end

data/app/commands/decidim/messaging/reply_to_conversation.rb

@@ -28,7 +28,7 @@ module Decidim
 
           broadcast(:ok, message)
         else
-          broadcast(:invalid)
+          broadcast(:invalid, message.errors.full_messages)
         end
       end
 

data/app/commands/decidim/multiple_attachments_methods.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Decidim
+  module MultipleAttachmentsMethods
+    private
+
+    def build_attachments
+      @documents = []
+      @form.add_documents.each do |file|
+        @documents << Attachment.new(
+          title: { I18n.locale => file.original_filename },
+          attached_to: @attached_to || documents_attached_to,
+          file: file
+        )
+      end
+    end
+
+    def attachments_invalid?
+      @documents.each do |file|
+        if file.invalid? && file.errors.has_key?(:file)
+          @form.errors.add(:add_documents, file.errors[:file])
+          return true
+        end
+      end
+      false
+    end
+
+    def create_attachments
+      @documents.map! do |file|
+        file.attached_to = documents_attached_to
+        file.save!
+        @form.documents << file.id.to_s
+      end
+    end
+
+    def document_cleanup!
+      documents_attached_to.documents.each do |file|
+        file.destroy! if @form.documents.exclude? file.id.to_s
+      end
+
+      documents_attached_to.reload
+      documents_attached_to.instance_variable_set(:@documents, nil)
+    end
+
+    def process_attachments?
+      @form.add_documents.any?
+    end
+
+    def documents_attached_to
+      return @attached_to if @attached_to.present?
+      return form.current_organization if form.respond_to?(:current_organization)
+
+      form.current_component.organization if form.respond_to?(:current_component)
+    end
+  end
+end

data/app/controllers/concerns/decidim/devise_controllers.rb

@@ -18,6 +18,7 @@ module Decidim
       include ImpersonateUsers
       include NeedsPermission
       include Decidim::SafeRedirect
+      include NeedsSnippets
 
       helper Decidim::TranslationsHelper
       helper Decidim::MetaTagsHelper

data/app/controllers/concerns/decidim/filter_resource.rb

@@ -60,19 +60,37 @@ module Decidim
         {}
       end
 
+      def default_filter_category_params
+        return "all" unless current_component.participatory_space.categories.any?
+
+        ["all"] + current_component.participatory_space.categories.pluck(:id).map(&:to_s)
+      end
+
+      def default_filter_scope_params
+        return "all" unless current_component.scopes.any?
+
+        if current_component.scope
+          ["all", current_component.scope.id] + current_component.scope.children.map { |scope| scope.id.to_s }
+        else
+          %w(all global) + current_component.scopes.pluck(:id).map(&:to_s)
+        end
+      end
+
       # If the controller responds to current_component, its search service uses the
       # base class Decidim::ResourceSearch; else it uses the ParticipatorySpaceSearch.
       # They need different context_params to set up the base_query:
       # - ResourceSearch uses `component`
       # - ParticipatorySpaceSearch uses `organization`
       # - Both use `current_user`
+      # - Both need `organization` for localized searches in order to fetch the
+      #   available locales from the organization in Decidim::ResourceSearch.
       def context_params
-        context = { current_user: current_user }
-        if respond_to?(:current_component)
-          context[:component] = current_component
-        else
-          context[:organization] = current_organization
-        end
+        context = {
+          current_user: current_user,
+          organization: current_organization
+        }
+        context[:component] = current_component if respond_to?(:current_component)
+
         context
       end
     end

data/app/controllers/concerns/decidim/flaggable.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  # A controller concern to enable flagging capabilities to its resources. Only
+  # affects the UI, so make sure you check the controller resources implement
+  # the `Decidim::Reportable` model concern.
+  module Flaggable
+    extend ActiveSupport::Concern
+
+    included do
+      helper_method :flaggable_controller?
+
+      def flaggable_controller?
+        true
+      end
+    end
+  end
+end

data/app/controllers/concerns/decidim/force_authentication.rb

@@ -22,6 +22,7 @@ module Decidim
       # Next stop: Let's check whether auth is ok
       unless user_signed_in?
         flash[:warning] = t("actions.login_before_access", scope: "decidim.core")
+        store_location_for(:user, request.path)
         return redirect_to decidim.new_user_session_path
       end
     end

data/app/controllers/concerns/decidim/impersonate_users.rb

@@ -23,7 +23,7 @@ module Decidim
 
       # Returns a manager user if the real user has an active impersonation
       def current_user
-        managed_user || real_user
+        @current_user ||= managed_user || real_user
       end
 
       # Clear the `@real_user` instance variable because otherwise that would be

data/app/controllers/concerns/decidim/needs_snippets.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  # This module provides capability for storing conditional snippets during the
+  # page view that need to be displayed in different part of the view than where
+  # they are registered at.
+  module NeedsSnippets
+    extend ActiveSupport::Concern
+
+    included do
+      helper_method :snippets
+    end
+
+    def snippets
+      @snippets ||= Decidim::Snippets.new
+    end
+  end
+end

data/app/controllers/concerns/decidim/paginable.rb

@@ -10,7 +10,7 @@ module Decidim
     OPTIONS = [20, 50, 100].freeze
 
     included do
-      helper_method :per_page
+      helper_method :per_page, :page_offset
       helper Decidim::PaginateHelper
 
       def paginate(resources)
@@ -20,6 +20,10 @@ module Decidim
       def per_page
         params[:per_page] || OPTIONS.first
       end
+
+      def page_offset
+        [params[:page].to_i - 1, 0].max * per_page
+      end
     end
   end
 end

data/app/controllers/concerns/decidim/withdrawable.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  # A controller concern to enable withawing the controller resources. Only
+  # affects the UI, so the actual logic to withdraw the resource will still need
+  # to be implemented.
+  module Withdrawable
+    extend ActiveSupport::Concern
+
+    included do
+      helper_method :withdrawable_controller?
+
+      def withdrawable_controller?
+        true
+      end
+    end
+  end
+end

data/app/controllers/decidim/application_controller.rb

@@ -16,6 +16,7 @@ module Decidim
     include ActionAuthorization
     include ForceAuthentication
     include SafeRedirect
+    include NeedsSnippets
 
     helper Decidim::MetaTagsHelper
     helper Decidim::DecidimFormHelper
@@ -38,6 +39,9 @@ module Decidim
     # right page.
     before_action :store_current_location
 
+    before_action :store_machine_translations_toggle
+    helper_method :machine_translations_toggled?
+
     protect_from_forgery with: :exception, prepend: true
     after_action :add_vary_header
 
@@ -59,6 +63,18 @@ module Decidim
       store_location_for(:user, value)
     end
 
+    # We store whether the user is requesting to toggle the translations or not.
+    # We need to store it this way because if we use an instance variable, then
+    # we're not able to access that value from inside the presenters, and we
+    # need it there to translate some attributes.
+    def store_machine_translations_toggle
+      RequestStore.store[:toggle_machine_translations] = params[:toggle_translations].present?
+    end
+
+    def machine_translations_toggled?
+      RequestStore.store[:toggle_machine_translations]
+    end
+
     def skip_store_location?
       # Skip if Devise already handles the redirection
       return true if devise_controller? && redirect_url.blank?

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

@@ -24,13 +24,14 @@ module Decidim
       helper Decidim::AttachmentsHelper
       helper Decidim::SanitizeHelper
       helper Decidim::PadHelper
+      helper Decidim::FilterParamsHelper
 
       helper_method :current_component,
                     :current_participatory_space,
                     :current_manifest
 
       before_action do
-        enforce_permission_to :read, :component, component: current_component
+        enforce_permission_to :read, :component, component: current_component, share_token: share_token
       end
 
       before_action :redirect_unless_feature_private
@@ -47,6 +48,10 @@ module Decidim
         @current_manifest ||= current_component.manifest
       end
 
+      def share_token
+        params[:share_token]
+      end
+
       def permission_scope
         :public
       end

data/app/controllers/decidim/cookie_policy_controller.rb

@@ -6,9 +6,12 @@ module Decidim
     skip_before_action :store_current_location
 
     def accept
-      response.set_cookie "decidim-cc", value: "true",
-                                        path: "/",
-                                        expires: 1.year.from_now.utc
+      response.set_cookie(
+        Decidim.config.consent_cookie_name,
+        value: "true",
+        path: "/",
+        expires: 1.year.from_now.utc
+      )
 
       respond_to do |format|
         format.js

data/app/controllers/decidim/messaging/conversations_controller.rb

@@ -77,8 +77,11 @@ module Decidim
             render action: :update, locals: { message: message }
           end
 
-          on(:invalid) do
-            render json: { error: I18n.t("messaging.conversations.update.error", scope: "decidim") }, status: :unprocessable_entity
+          on(:invalid) do |messages|
+            render action: :error, locals: {
+              error: I18n.t("messaging.conversations.update.error", scope: "decidim"),
+              messages: messages
+            }, status: :unprocessable_entity
           end
         end
       end

data/app/forms/decidim/account_form.rb

@@ -4,6 +4,8 @@ module Decidim
   # The form object that handles the data behind updating a user's
   # account in her profile page.
   class AccountForm < Form
+    include Decidim::HasUploadValidations
+
     mimic :user
 
     attribute :name
@@ -24,12 +26,14 @@ module Decidim
     validates :password, confirmation: true
     validates :password, password: { name: :name, email: :email, username: :nickname }, if: -> { password.present? }
     validates :password_confirmation, presence: true, if: :password_present
-    validates :avatar, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_avatar_size } }
+    validates :avatar, passthru: { to: Decidim::User }
 
     validate :unique_email
     validate :unique_nickname
     validate :personal_url_format
 
+    alias organization current_organization
+
     def personal_url
       return if super.blank?
 

data/app/forms/decidim/amendable/create_form.rb

@@ -11,8 +11,8 @@ module Decidim
       attribute :emendation_params, Hash
 
       validates :amendable_gid, presence: true
-      validate :emendation_must_change_amendable
       validate :amendable_form_must_be_valid
+      validate :emendation_must_change_amendable
 
       def amendable
         @amendable ||= GlobalID::Locator.locate_signed(amendable_gid)

data/app/forms/decidim/amendable/form.rb

@@ -4,6 +4,8 @@ module Decidim
   module Amendable
     # a form object common for amendments
     class Form < Decidim::Form
+      include Decidim::TranslatableAttributes
+
       mimic :amendment
 
       def amendment
@@ -29,7 +31,7 @@ module Decidim
         return unless %w(title body).all? { |attr| attr.in? amendable_fields_as_string }
 
         emendation = amendable.class.new(emendation_params)
-        return unless amendable.title == emendation.title
+        return unless translated_attribute(amendable.title) == emendation.title
         return unless normalized_body(amendable) == normalized_body(emendation)
 
         amendable_form.errors.add(:title, :identical)
@@ -38,22 +40,44 @@ module Decidim
 
       # Normalizes the escape sequences used for newlines.
       def normalized_body(resource)
-        Decidim::ContentParsers::NewlineParser.new(resource.body, context: {}).rewrite
+        body = translated_attribute(resource.body)
+        Decidim::ContentParsers::NewlineParser.new(body, context: {}).rewrite
       end
 
       # Validates the emendation using the amendable form.
       def amendable_form_must_be_valid
         parse_hashtaggable_params
+        original_form.validate unless defined?(@original_form) # Preserves previously added errors.
+
         amendable_form.validate unless defined?(@amendable_form) # Preserves previously added errors.
+
+        compare_amendable_form_errors(@amendable_form.errors.dup) if @original_form.present? && @original_form.errors.details.count.positive?
+
         @errors = @amendable_form.errors
       end
 
+      # Compare the amendable_form errors and original_form errors
+      # If amendable_form add more errors than original, error is stored in amendable_form errors.
+      #
+      # Params: amendable_form_errors => Duplicated @amendable_form.errors
+      def compare_amendable_form_errors(amendable_form_errors)
+        @amendable_form.errors.clear
+        @original_form.errors.details.keys.each do |key|
+          errors = amendable_form_errors.details[key] - @original_form.errors.details[key]
+
+          errors.map do |hash|
+            @amendable_form.errors.add(key, hash[:error]) unless @amendable_form.errors.details[key].include? error: hash[:error]
+          end
+        end
+      end
+
       # Parses :title and :body attribute values with HashtagParser.
       def parse_hashtaggable_params
         emendation_params.each do |key, value|
           next unless [:title, :body].include?(key)
 
-          emendation_params[key] = Decidim::ContentParsers::HashtagParser.new(value, form_context).rewrite
+          clean_value = translated_attribute(value)
+          emendation_params[key] = Decidim::ContentParsers::HashtagParser.new(clean_value, form_context).rewrite
         end
       end
 
@@ -63,6 +87,23 @@ module Decidim
         @amendable_form ||= amendable.amendable_form.from_params(emendation_params).with_context(form_context)
       end
 
+      def original_form
+        @original_form ||= i18n_amendable
+                           .amendable_form
+                           .from_model(@i18n_amendable)
+                           .with_context(
+                             current_component: @i18n_amendable.component,
+                             current_participatory_space: @i18n_amendable.participatory_space
+                           )
+      end
+
+      def i18n_amendable
+        @i18n_amendable ||= amendable
+        @i18n_amendable.title = translated_attribute(amendable.title)
+        @i18n_amendable.body = normalized_body(amendable)
+        @i18n_amendable
+      end
+
       # Returns the amendable fields keys as String.
       def amendable_fields_as_string
         amendable.amendable_fields.map(&:to_s)