decidim-core 0.0.5 → 0.0.6

data/app/controllers/decidim/cookie_policy_controller.rb

@@ -10,6 +10,11 @@ module Decidim
       response.set_cookie "decidim-cc", value: "true",
                                         path: "/",
                                         expires: 1.year.from_now.utc
+
+      respond_to do |format|
+        format.js
+        format.html { redirect_back fallback_location: root_path }
+      end
     end
   end
 end

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

@@ -3,15 +3,7 @@ module Decidim
   module Devise
     # Custom Devise ConfirmationsController to avoid namespace problems.
     class ConfirmationsController < ::Devise::ConfirmationsController
-      include Decidim::NeedsOrganization
-      include Decidim::LocaleSwitcher
-      helper Decidim::TranslationsHelper
-      helper Decidim::MetaTagsHelper
-      helper Decidim::DecidimFormHelper
-      helper Decidim::LanguageChooserHelper
-      helper Decidim::CookiesHelper
-
-      layout "layouts/decidim/application"
+      include Decidim::DeviseControllers
     end
   end
 end

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

@@ -3,15 +3,7 @@ module Decidim
   module Devise
     # This controller customizes the behaviour of Devise::Invitiable.
     class InvitationsController < ::Devise::InvitationsController
-      include Decidim::NeedsOrganization
-      include Decidim::LocaleSwitcher
-      helper Decidim::TranslationsHelper
-      helper Decidim::MetaTagsHelper
-      helper Decidim::DecidimFormHelper
-      helper Decidim::LanguageChooserHelper
-      helper Decidim::CookiesHelper
-
-      layout "layouts/decidim/application"
+      include Decidim::DeviseControllers
 
       # We don't users to create invitations, so we just redirect them to the
       # homepage.

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

@@ -4,16 +4,7 @@ module Decidim
     # This controller customizes the behaviour of Devise::Omniauthable.
     class OmniauthRegistrationsController < ::Devise::OmniauthCallbacksController
       include FormFactory
-
-      include Decidim::NeedsOrganization
-      include Decidim::LocaleSwitcher
-      helper Decidim::TranslationsHelper
-      helper Decidim::MetaTagsHelper
-      helper Decidim::DecidimFormHelper
-      helper Decidim::LanguageChooserHelper
-      helper Decidim::CookiesHelper
-
-      layout "layouts/decidim/application"
+      include Decidim::DeviseControllers
 
       def new
         @form = form(OmniauthRegistrationForm).from_params(params[:user])

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

@@ -3,15 +3,7 @@ module Decidim
   module Devise
     # Custom Devise PasswordsController to avoid namespace problems.
     class PasswordsController < ::Devise::PasswordsController
-      include Decidim::NeedsOrganization
-      include Decidim::LocaleSwitcher
-      helper Decidim::TranslationsHelper
-      helper Decidim::MetaTagsHelper
-      helper Decidim::DecidimFormHelper
-      helper Decidim::LanguageChooserHelper
-      helper Decidim::CookiesHelper
-
-      layout "layouts/decidim/application"
+      include Decidim::DeviseControllers
     end
   end
 end

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

@@ -4,19 +4,12 @@ module Decidim
     # This controller customizes the behaviour of Devise's
     # RegistrationsController so we can specify a custom layout.
     class RegistrationsController < ::Devise::RegistrationsController
-      include Decidim::NeedsOrganization
-      include Decidim::LocaleSwitcher
       include FormFactory
-      helper Decidim::TranslationsHelper
-      helper Decidim::OmniauthHelper
-      helper Decidim::MetaTagsHelper
-      helper Decidim::DecidimFormHelper
-      helper Decidim::LanguageChooserHelper
-      helper Decidim::CookiesHelper
+      include Decidim::DeviseControllers
 
+      helper Decidim::OmniauthHelper
       helper_method :terms_and_conditions_page
 
-      layout "layouts/decidim/application"
       before_action :configure_permitted_parameters
       helper_method :terms_and_conditions_page
 
@@ -69,12 +62,6 @@ module Decidim
         super(hash)
         resource.organization = current_organization
       end
-
-      private
-
-      def terms_and_conditions_page
-        @terms_and_conditions_page ||= Decidim::StaticPage.find_by_slug("terms-and-conditions")
-      end
     end
   end
 end

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

@@ -3,23 +3,13 @@ module Decidim
   module Devise
     # Custom Devise SessionsController to avoid namespace problems.
     class SessionsController < ::Devise::SessionsController
-      include Decidim::NeedsOrganization
-      include Decidim::LocaleSwitcher
-      helper Decidim::TranslationsHelper
+      include Decidim::DeviseControllers
       helper Decidim::OmniauthHelper
-      helper Decidim::MetaTagsHelper
-      helper Decidim::DecidimFormHelper
-      helper Decidim::LanguageChooserHelper
-      helper Decidim::CookiesHelper
-
-      layout "layouts/decidim/application"
 
       def after_sign_in_path_for(user)
-        if !pending_redirect?(user) && first_login_and_not_authorized?(user)
-          first_login_authorizations_path
-        else
-          super
-        end
+        return first_login_authorizations_path if first_login_and_not_authorized?(user) &&
+                                                  !user.roles.include?("admin")
+        super
       end
 
       # Calling the `stored_location_for` method removes the key, so in order
@@ -31,7 +21,11 @@ module Decidim
       end
 
       def first_login_and_not_authorized?(user)
-        user.is_a?(User) && user.sign_in_count == 1 && Decidim.authorization_handlers.any?
+        user.is_a?(User) && user.sign_in_count == 1 && current_organization.available_authorizations.any?
+      end
+
+      def after_sign_out_path_for(user)
+        request.referer || super
       end
     end
   end

data/{lib → app/controllers}/decidim/features/base_controller.rb

@@ -11,11 +11,15 @@ module Decidim
       include FeatureSettings
       include ActionAuthorization
 
+      helper Decidim::FiltersHelper
+      helper Decidim::OrdersHelper
+      helper Decidim::FeatureReferenceHelper
       helper Decidim::TranslationsHelper
       helper Decidim::ParticipatoryProcessHelper
       helper Decidim::ResourceHelper
+      helper Decidim::OrganizationScopesHelper
       helper Decidim::ActionAuthorizationHelper
-      helper Decidim::MetaTagsHelper
+      helper Decidim::AttachmentsHelper
 
       helper_method :current_feature,
                     :current_manifest

data/app/controllers/decidim/participatory_process_groups_controller.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+require_dependency "decidim/application_controller"
+
+module Decidim
+  class ParticipatoryProcessGroupsController < ApplicationController
+    helper_method :participatory_processes, :group
+
+    def show
+      authorize! :read, ParticipatoryProcessGroup
+    end
+
+    private
+
+    def participatory_processes
+      @participatory_processes ||= group.participatory_processes.published
+    end
+
+    def group
+      Decidim::ParticipatoryProcessGroup.find(params[:id])
+    end
+  end
+end

data/app/controllers/decidim/participatory_process_steps_controller.rb

@@ -9,6 +9,8 @@ module Decidim
     layout "layouts/decidim/participatory_process", only: [:index]
     include NeedsParticipatoryProcess
 
+    helper Decidim::ParticipatoryProcessHelper
+
     def index
       authorize! :read, ParticipatoryProcess
     end

data/app/controllers/decidim/participatory_processes_controller.rb

@@ -11,10 +11,13 @@ module Decidim
 
     skip_after_action :verify_participatory_process, only: [:index]
 
-    helper_method :participatory_processes, :promoted_participatory_processes
+    helper Decidim::AttachmentsHelper
+    helper Decidim::ParticipatoryProcessHelper
+    helper_method :collection, :promoted_participatory_processes, :participatory_processes
 
     def index
       authorize! :read, ParticipatoryProcess
+      authorize! :read, ParticipatoryProcessGroup
     end
 
     def show
@@ -23,12 +26,20 @@ module Decidim
 
     private
 
+    def collection
+      @collection ||= public_processes.collection
+    end
+
     def participatory_processes
-      @processes ||= OrganizationParticipatoryProcesses.new(current_organization) | PublicParticipatoryProcesses.new
+      @participatory_processes ||= public_processes.participatory_processes
     end
 
     def promoted_participatory_processes
-      @promoted_processes ||= participatory_processes | PromotedParticipatoryProcesses.new
+      @promoted_processes ||= participatory_processes.promoted
+    end
+
+    def public_processes
+      @public_processes ||= PublicProcesses.new(current_organization)
     end
   end
 end

data/app/controllers/decidim/reports_controller.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Exposes the report resource so users can report a reportable.
+  class ReportsController < Decidim::ApplicationController
+    include FormFactory
+    before_action :authenticate_user!
+
+    def create
+      authorize! :report, reportable
+
+      @form = form(Decidim::ReportForm).from_params(params)
+
+      CreateReport.call(@form, reportable, current_user) do
+        on(:ok) do
+          flash[:notice] = I18n.t("decidim.reports.create.success")
+          redirect_back fallback_location: root_path
+        end
+
+        on(:invalid) do
+          flash[:alert] = I18n.t("decidim.reports.create.error")
+          redirect_back fallback_location: root_path
+        end
+      end
+    end
+
+    private
+
+    def reportable
+      @reportable ||= GlobalID::Locator.locate_signed params[:sgid]
+    end
+  end
+end

data/app/controllers/decidim/static_map_controller.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+require_dependency "decidim/application_controller"
+
+module Decidim
+  class StaticMapController < ApplicationController
+    skip_authorization_check
+
+    def show
+      send_data StaticMapGenerator.new(resource).data, type: "image/jpeg", disposition: "inline"
+    end
+
+    private
+
+    def resource
+      @resource ||= GlobalID::Locator.locate_signed params[:sgid]
+    end
+  end
+end

data/app/forms/decidim/report_form.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+module Decidim
+  # A form object to be used when public users want to report a reportable.
+  class ReportForm < Decidim::Form
+    mimic :report
+
+    attribute :reason, String
+    attribute :details, String
+
+    validates :reason, inclusion: { in: Report::REASONS }
+  end
+end

data/app/helpers/decidim/application_helper.rb

@@ -3,8 +3,6 @@
 module Decidim
   # Main module to add application-wide helpers.
   module ApplicationHelper
-    include Decidim::MetaTagsHelper
-
     # Truncates a given text respecting its HTML tags.
     #
     # text    - The String text to be truncated.

data/app/helpers/decidim/feature_reference_helper.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+module Decidim
+  # Helper to print Feature references.
+  module FeatureReferenceHelper
+    # Displays the localized reference for the given feature.
+    #
+    # feature - the Feature that has the reference to display.
+    #
+    # Returns a String.
+    def feature_reference(feature)
+      return unless feature.reference
+      @reference = feature.reference
+      "<div class='reference'>#{localized_reference}</div>".html_safe
+    end
+
+    private
+
+    def localized_reference
+      I18n.t("reference", reference: @reference, scope: "decidim.shared.reference")
+    end
+  end
+end

data/app/helpers/decidim/map_helper.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+module Decidim
+  # This helper include some methods for rendering resources static and dynamic maps.
+  module MapHelper
+    # Renders a link to openstreetmaps with the resource latitude and longitude.
+    # The link's content is a static map image.
+    #
+    # resource - A geolocalizable resource
+    # options - An optional hash of options (default: { zoom: 17 })
+    #           * zoom: A number to represent the zoom value of the map
+    def static_map_link(resource, options = {})
+      if resource.geocoded?
+        zoom = options[:zoom] || 17
+        latitude = resource.latitude
+        longitude = resource.longitude
+
+        map_url = "https://www.openstreetmap.org/?mlat=#{latitude}&mlon=#{longitude}#map=#{zoom}/#{latitude}/#{longitude}"
+
+        link_to map_url, target: "_blank" do
+          image_tag decidim.static_map_path(sgid: resource.to_sgid.to_s)
+        end
+      end
+    end
+
+    def dynamic_map_for(markers_data, &block)
+      if Decidim.geocoder.present?
+        map_html_options = {
+          class: "google-map",
+          id: "map",
+          "data-markers-data" => markers_data.to_json,
+          "data-here-app-id" => Decidim.geocoder[:here_app_id],
+          "data-here-app-code" => Decidim.geocoder[:here_app_code]
+        }
+        content = capture { block.call }
+        content_tag :div, class: "row column" do
+          content_tag(:div, "", map_html_options) + content
+        end
+      end
+    end
+  end
+end

data/app/helpers/decidim/organization_scopes_helper.rb

@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+module Decidim
+  # A Helper to render scopes, including a global scope, for forms.
+  module OrganizationScopesHelper
+    # Public: Returns a collection of the given organization scopes, prepending
+    # a global scope. The global scope is at the beginning because it's easier
+    # to be found there. Use this helper in places like `select` elements in forms.
+    # If you need to show scopes in a search form backed by a `Searchlight::Search`
+    # class, see the `search_organization_scopes` helper method.
+    #
+    # organization - a Decidim::Organization. Uses the `current_organization` helper
+    #   by default.
+    #
+    # Returns an Array.
+    def organization_scopes(organization = current_organization)
+      [Struct.new(:id, :name).new("", I18n.t("decidim.participatory_processes.scopes.global"))] + organization.scopes
+    end
+
+    # Public: Returns a collection of the given organization scopes, prepending
+    # a global scope. The global scope is at the beginning because it's easier
+    # to be found there. Use this helper in search forms backed by a
+    # `Searchlight::Search` class. The reason is, in the `organization_scopes`
+    # method we use an empty String as the ID for the Global Scope object, which
+    # works fine in normal forms, but Searchlight ignores parameters that are empty
+    # Arrays, empty Strings, empty Hashes or nil, so if you want to actively filter
+    # those elements that do not have a scope, you cannot send an empty String or
+    # nil because Searchlight will ignore the parameter. The only solution here is
+    # to use a specific String as ID (`"global"`, in our case), and then treat this
+    # case in the search class. This is far from ideal, but I don't know a better
+    # way to do this.
+    #
+    # organization - a Decidim::Organization. Uses the `current_organization` helper
+    #   by default.
+    #
+    # Returns an Array.
+    def search_organization_scopes(organization = current_organization)
+      [Struct.new(:id, :name).new("global", I18n.t("decidim.participatory_processes.scopes.global"))] + organization.scopes
+    end
+  end
+end

data/app/helpers/decidim/replace_buttons_helper.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+module Decidim
+  module ReplaceButtonsHelper
+    # Overrides the submit tags to always be buttons instead of inputs.
+    # Buttons are much more stylable and less prone to bugs.
+    #
+    # value   - The text of the button
+    # options - Options to provide to the actual tag.
+    #
+    # Returns a SafeString with the tag.
+    def submit_tag(text = "Save changes", options = {})
+      options = options.stringify_keys
+
+      content_tag :button, text, { "type" => "submit", "name" => "commit" }.update(options)
+    end
+
+    # Public: Overrides button_to so it always renders buttons instead of
+    # input tags.
+    #
+    # arguments - The same arguments that would be sent to `button_to`.
+    # block     - An optional block to be sent.
+    #
+    # Returns a button.
+    def button_to(*arguments, &block)
+      if block_given?
+        body = block
+        url = arguments[0]
+        html_options = arguments[1] || {}
+      else
+        body = arguments[0]
+        url = arguments[1]
+        html_options = arguments[2] || {}
+      end
+
+      if block_given?
+        super(url, html_options, &body)
+      else
+        super(url, html_options) { body }
+      end
+    end
+  end
+end