decidim 0.5.1 → 0.6.0

data/decidim-core/app/commands/decidim/invite_user.rb

@@ -43,9 +43,7 @@ module Decidim
         email: form.email.downcase,
         organization: form.organization,
         admin: form.role == "admin",
-        roles: form.role == "admin" ? [] : [form.role],
-        comments_notifications: true,
-        replies_notifications: true
+        roles: form.role == "admin" ? [] : [form.role]
       )
       @user.invite!(
         form.invited_by,

data/decidim-core/app/commands/decidim/update_notifications_settings.rb

@@ -24,8 +24,7 @@ module Decidim
     private
 
     def update_notifications_settings
-      @user.comments_notifications = @form.comments_notifications
-      @user.replies_notifications = @form.replies_notifications
+      @user.email_on_notification = @form.email_on_notification
       @user.newsletter_notifications = @form.newsletter_notifications
     end
   end

data/decidim-core/app/constraints/decidim/current_feature.rb

@@ -20,9 +20,8 @@ module Decidim
     def matches?(request)
       env = request.env
 
-      return false unless CurrentParticipatoryProcess.new.matches?(request)
-
-      @participatory_process = env["decidim.current_participatory_process"]
+      @participatory_space = env["decidim.current_participatory_space"]
+      return false unless @participatory_space
 
       current_feature(env, request.params) ? true : false
     end
@@ -34,7 +33,7 @@ module Decidim
     end
 
     def detect_current_feature(params)
-      @participatory_process.features.find do |feature|
+      @participatory_space.features.find do |feature|
         params["feature_id"] == feature.id.to_s && feature.manifest_name == @manifest.name.to_s
       end
     end

data/decidim-core/app/controllers/concerns/decidim/settings.rb

@@ -16,7 +16,7 @@ module Decidim
       end
 
       def current_settings
-        @current_settings ||= current_feature.active_step_settings
+        @current_settings ||= current_feature.current_settings
       end
     end
   end

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

@@ -6,8 +6,6 @@ module Decidim
     # setting the appropiate layout, including necessary helpers, and overall
     # fooling the engine into thinking it's isolated.
     class BaseController < Decidim::ApplicationController
-      layout "layouts/decidim/participatory_process"
-      include NeedsParticipatoryProcess
       include Settings
       include ActionAuthorization
 
@@ -15,7 +13,6 @@ module Decidim
       helper Decidim::OrdersHelper
       helper Decidim::FeatureReferenceHelper
       helper Decidim::TranslationsHelper
-      helper Decidim::ParticipatoryProcessHelper
       helper Decidim::IconHelper
       helper Decidim::ResourceHelper
       helper Decidim::ScopesHelper
@@ -23,12 +20,14 @@ module Decidim
       helper Decidim::AttachmentsHelper
 
       helper_method :current_feature,
+                    :current_participatory_space,
                     :current_manifest
 
       skip_authorize_resource
 
       before_action do
-        authorize! :read, current_participatory_process
+        extend current_participatory_space.extension_module
+
         authorize! :read, current_feature
       end
 
@@ -40,8 +39,8 @@ module Decidim
         @current_manifest ||= current_feature.manifest
       end
 
-      def current_participatory_process
-        request.env["decidim.current_participatory_process"]
+      def current_participatory_space
+        current_feature.participatory_space
       end
 
       def ability_context

data/decidim-core/app/controllers/decidim/follows_controller.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Decidim
+  class FollowsController < Decidim::ApplicationController
+    include FormFactory
+    before_action :authenticate_user!
+    helper_method :resource
+
+    def destroy
+      @form = form(Decidim::FollowForm).from_params(params)
+      authorize! :delete, @form.follow
+
+      DeleteFollow.call(@form, current_user) do
+        on(:ok) do
+          render :update_button
+        end
+
+        on(:invalid) do
+          render json: { error: I18n.t("follows.destroy.error", scope: "decidim") }, status: 422
+        end
+      end
+    end
+
+    def create
+      @form = form(Decidim::FollowForm).from_params(params)
+      authorize! :create, Follow
+
+      CreateFollow.call(@form, current_user) do
+        on(:ok) do
+          render :update_button
+        end
+
+        on(:invalid) do
+          render json: { error: I18n.t("follows.create.error", scope: "decidim") }, status: 422
+        end
+      end
+    end
+
+    def resource
+      @resource ||= GlobalID::Locator.locate_signed(
+        params[:follow][:followable_gid]
+      )
+    end
+  end
+end

data/decidim-core/app/controllers/decidim/notifications_controller.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Decidim
+  # The controller to handle the user's notifications dashboard.
+  class NotificationsController < Decidim::ApplicationController
+    helper Decidim::IconHelper
+    helper Decidim::PaginateHelper
+    include Paginable
+
+    helper_method :notifications
+
+    def index
+      authorize! :read, Notification
+      @notifications = paginate(notifications)
+    end
+
+    def destroy
+      notification = notifications.find(params[:id])
+      authorize! :destroy, notification
+      notification.destroy
+    end
+
+    def read_all
+      authorize! :destroy, notifications.first
+      notifications.destroy_all
+    end
+
+    private
+
+    def notifications
+      @notifications ||= current_user.notifications.order(created_at: :desc)
+    end
+
+    # Private: overwrites the amount of elements per page.
+    def per_page
+      50
+    end
+  end
+end

data/decidim-core/app/controllers/decidim/pages_controller.rb

@@ -25,12 +25,12 @@ module Decidim
 
     def promoted_participatory_processes
       @promoted_participatory_processes ||=
-        OrganizationPrioritizedParticipatoryProcesses.new(current_organization) | PromotedParticipatoryProcesses.new
+        ParticipatoryProcesses::OrganizationPrioritizedParticipatoryProcesses.new(current_organization) | ParticipatoryProcesses::PromotedParticipatoryProcesses.new
     end
 
     def highlighted_participatory_processes
       @highlighted_participatory_processes ||=
-        OrganizationPublishedParticipatoryProcesses.new(current_organization) | HighlightedParticipatoryProcesses.new
+        ParticipatoryProcesses::OrganizationPublishedParticipatoryProcesses.new(current_organization) | ParticipatoryProcesses::HighlightedParticipatoryProcesses.new
     end
 
     private

data/decidim-core/app/controllers/decidim/scopes_controller.rb

@@ -3,6 +3,8 @@
 module Decidim
   # Exposes the scopes text search so users can choose a scope writing its name.
   class ScopesController < Decidim::ApplicationController
+    skip_before_action :store_current_location
+
     def search
       authorize! :search, Scope
       root = Scope.where(id: params[:root], organization: current_organization).first

data/decidim-core/app/controllers/decidim/widgets_controller.rb

@@ -8,7 +8,7 @@ module Decidim
 
     layout "decidim/widget"
 
-    helper_method :model, :iframe_url, :current_participatory_process
+    helper_method :model, :iframe_url, :current_participatory_space
 
     def show
       respond_to do |format|
@@ -19,8 +19,8 @@ module Decidim
 
     private
 
-    def current_participatory_process
-      @current_participatory_process ||= model.feature.participatory_process
+    def current_participatory_space
+      @current_participatory_space ||= model.feature.participatory_space
     end
 
     def iframe_url

data/decidim-core/app/forms/decidim/follow_form.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A form object to be used when users want to follow a followable resource.
+  class FollowForm < Decidim::Form
+    mimic :follow
+
+    attribute :followable_gid, String
+
+    validates :followable_gid, :followable, presence: true
+
+    def followable
+      @followable ||= GlobalID::Locator.locate_signed followable_gid
+    end
+
+    def follow
+      @follow ||= Decidim::Follow.where(user: current_user, followable: followable).first
+    end
+  end
+end

data/decidim-core/app/forms/decidim/invite_user_form.rb

@@ -33,7 +33,7 @@ module Decidim
     def available_roles_for_select
       Decidim::User::ROLES.map do |role|
         [
-          I18n.t(role, scope: "decidim.admin.models.user.fields.roles"),
+          I18n.t("models.user.fields.roles.#{role}", scope: "decidim.admin"),
           role
         ]
       end

data/decidim-core/app/forms/decidim/notifications_settings_form.rb

@@ -6,12 +6,10 @@ module Decidim
   class NotificationsSettingsForm < Form
     mimic :user
 
-    attribute :comments_notifications
-    attribute :replies_notifications
+    attribute :email_on_notification
     attribute :newsletter_notifications
 
-    validates :comments_notifications, presence: true
-    validates :replies_notifications, presence: true
+    validates :email_on_notification, presence: true
     validates :newsletter_notifications, presence: true
   end
 end

data/decidim-core/app/helpers/decidim/action_authorization_helper.rb

@@ -67,11 +67,12 @@ module Decidim
       end
 
       unless current_user_authorized?(action)
-        html_options["onclick"] = "event.preventDefault();"
         html_options["data-toggle"] = current_user ? "#{action.to_s.underscore}AuthorizationModal" : "loginModal"
         url = ""
       end
 
+      html_options["onclick"] = "event.preventDefault();" if url == ""
+
       if block_given?
         button_to(url, html_options, &body)
       else

data/decidim-core/app/helpers/decidim/decidim_form_helper.rb

@@ -13,6 +13,10 @@ module Decidim
     def decidim_form_for(record, options = {}, &block)
       options[:data] ||= {}
       options[:data].update(abide: true, "live-validate" => true, "validate-on-blur" => true)
+
+      options[:html] ||= {}
+      options[:html].update(novalidate: true)
+
       form_for(record, options, &block)
     end
 

data/decidim-core/app/helpers/decidim/feature_path_helper.rb

@@ -9,7 +9,7 @@ module Decidim
     #
     # Returns a url.
     def main_feature_path(feature)
-      feature_root_path_for(feature.manifest.engine, feature)
+      EngineRouter.main_proxy(feature).root_path
     end
 
     # Returns the defined admin root path for a given feature.
@@ -18,18 +18,7 @@ module Decidim
     #
     # Returns a url.
     def manage_feature_path(feature)
-      feature_root_path_for(feature.manifest.admin_engine, feature)
-    end
-
-    private
-
-    def feature_root_path_for(engine, feature)
-      url_params = {
-        feature_id: feature.id,
-        participatory_process_id: feature.participatory_process.id
-      }
-
-      engine.routes.url_helpers.root_path(url_params)
+      EngineRouter.admin_proxy(feature).root_path
     end
   end
 end

data/decidim-core/app/helpers/decidim/icon_helper.rb

@@ -7,23 +7,41 @@ module Decidim
     # a question mark when no icon is found.
     #
     # feature - The feature to generate the icon for.
+    # options - a Hash with options
     #
     # Returns an HTML tag with the icon.
-    def feature_icon(feature)
-      feature_manifest_icon(feature.manifest)
+    def feature_icon(feature, options = {})
+      manifest_icon(feature.manifest, options)
     end
 
-    # Public: Returns an icon given an instance of a Feature Manifest. It defaults to
+    # Public: Returns an icon given an instance of a Manifest. It defaults to
     # a question mark when no icon is found.
     #
-    # feature_manifest - The feature manifest to generate the icon for.
+    # manifest - The manifest to generate the icon for.
+    # options - a Hash with options
     #
     # Returns an HTML tag with the icon.
-    def feature_manifest_icon(feature_manifest)
-      if feature_manifest.icon
-        external_icon feature_manifest.icon
+    def manifest_icon(manifest, options = {})
+      if manifest.icon
+        external_icon manifest.icon, options
       else
-        icon "question-mark"
+        icon "question-mark", options
+      end
+    end
+
+    # Public: Finds the correct icon for the given resource. If the resource has a
+    # Feature then it uses it to find the icon, otherwise checks for the resource
+    # manifest to find the icon.
+    #
+    # resource - The resource to generate the icon for.
+    # options - a Hash with options
+    #
+    # Returns an HTML tag with the icon.
+    def resource_icon(resource, options = {})
+      if resource.respond_to?(:feature)
+        feature_icon(resource.feature, options)
+      else
+        manifest_icon(resource.manifest, options)
       end
     end
   end

data/decidim-core/app/helpers/decidim/paginate_helper.rb

@@ -8,7 +8,7 @@ module Decidim
     #
     # collection - a collection of elements that need to be paginated
     # paginate_params - a Hash with options to delegate to the pagination helper.
-    def decidim_paginate(collection, paginate_params)
+    def decidim_paginate(collection, paginate_params = {})
       # Kaminari uses url_for to generate the url, but this doesn't play nice with our engine system
       # and unless we remove these params they are added again as query string :(
       default_params = {

data/decidim-core/app/helpers/decidim/scopes_helper.rb

@@ -9,7 +9,7 @@ module Decidim
     #
     # Returns boolean.
     def has_visible_scopes?(resource)
-      current_participatory_process.scopes_enabled? && !current_participatory_process.scope.present? && resource.scope.present?
+      current_participatory_space.scopes_enabled? && !current_participatory_space.scope.present? && resource.scope.present?
     end
   end
 end

data/decidim-core/app/jobs/decidim/email_notification_generator_job.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Decidim
+  class EmailNotificationGeneratorJob < ApplicationJob
+    queue_as :decidim_events
+
+    def perform(event, event_class_name, resource, recipient_ids, extra)
+      event_class = event_class_name.constantize
+      EmailNotificationGenerator.new(event, event_class, resource, recipient_ids, extra).generate
+    end
+  end
+end

data/decidim-core/app/jobs/decidim/export_job.rb

@@ -12,9 +12,7 @@ module Decidim
       collection = export_manifest.collection.call(feature)
       serializer = export_manifest.serializer
 
-      export_data = Decidim::Exporters.const_get(format.upcase).new(collection, serializer).export
-
-      name = "#{name}-#{I18n.localize(Date.today, format: :default)}-#{Time.now.seconds_since_midnight.to_i}"
+      export_data = Decidim::Exporters.find_exporter(format).new(collection, serializer).export
 
       ExportMailer.export(user, name, export_data).deliver_now
     end

data/decidim-core/app/jobs/decidim/notification_generator_for_recipient_job.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  class NotificationGeneratorForRecipientJob < ApplicationJob
+    queue_as :decidim_events
+
+    def perform(event, event_class_name, resource, recipient_id, extra)
+      event_class = event_class_name.constantize
+      NotificationGeneratorForRecipient
+        .new(event, event_class, resource, recipient_id, extra)
+        .generate
+    end
+  end
+end