decidim 0.0.5 → 0.0.6

data/decidim-admin/app/commands/decidim/admin/update_participatory_process_step.rb

@@ -40,8 +40,7 @@ module Decidim
           title: form.title,
           start_date: form.start_date,
           end_date: form.end_date,
-          description: form.description,
-          short_description: form.short_description
+          description: form.description
         }
       end
     end

data/decidim-admin/app/controllers/decidim/admin/application_controller.rb

@@ -7,7 +7,11 @@ module Decidim
       include NeedsAuthorization
       include FormFactory
       include LocaleSwitcher
+      include PayloadInfo
       helper Decidim::DecidimFormHelper
+      helper Decidim::ReplaceButtonsHelper
+      helper Decidim::OrganizationScopesHelper
+      helper Decidim::TranslationsHelper
 
       helper Decidim::LanguageChooserHelper
 

data/decidim-admin/app/controllers/decidim/admin/categories_controller.rb

@@ -3,7 +3,7 @@ require_dependency "decidim/admin/application_controller"
 
 module Decidim
   module Admin
-    # Controller that allows managing all the Admins.
+    # Controller that allows managing categories.
     #
     class CategoriesController < ApplicationController
       include Concerns::ParticipatoryProcessAdmin

data/decidim-admin/app/controllers/decidim/admin/feature_permissions_controller.rb

@@ -3,7 +3,7 @@ require_dependency "decidim/admin/application_controller"
 
 module Decidim
   module Admin
-    # Controller that allows managing all the Admins.
+    # Controller that allows managing feature permissions.
     #
     class FeaturePermissionsController < ApplicationController
       include Concerns::ParticipatoryProcessAdmin
@@ -48,7 +48,7 @@ module Decidim
       end
 
       def authorizations
-        Decidim.authorization_handlers.map(&:handler_name)
+        current_organization.available_authorizations.map(&:constantize).map(&:handler_name)
       end
 
       def feature

data/decidim-admin/app/controllers/decidim/admin/moderations_controller.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+module Decidim
+  module Admin
+    # This controller allows admins to manage moderations in a participatory process.
+    class ModerationsController < Admin::ApplicationController
+      include Concerns::ParticipatoryProcessAdmin
+
+      helper_method :moderations
+
+      def index
+        authorize! :read, Decidim::Moderation
+      end
+
+      def unreport
+        authorize! :unreport, reportable
+
+        Admin::UnreportResource.call(reportable) do
+          on(:ok) do
+            flash[:notice] = I18n.t("reportable.unreport.success", scope: "decidim.moderations.admin")
+            redirect_to decidim_admin.participatory_process_moderations_path
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = I18n.t("reportable.unreport.invalid", scope: "decidim.moderations.admin")
+            redirect_to decidim_admin.participatory_process_moderations_path
+          end
+        end
+      end
+
+      def hide
+        authorize! :hide, reportable
+
+        Admin::HideResource.call(reportable) do
+          on(:ok) do
+            flash[:notice] = I18n.t("reportable.hide.success", scope: "decidim.moderations.admin")
+            redirect_to decidim_admin.participatory_process_moderations_path
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = I18n.t("reportable.hide.invalid", scope: "decidim.moderations.admin")
+            redirect_to decidim_admin.participatory_process_moderations_path
+          end
+        end
+      end
+
+      private
+
+      def moderations
+        @moderations ||= begin
+          moderations = Decidim::Moderation.where(participatory_process: participatory_process)
+          moderations = if params[:hidden]
+                          moderations.where.not(hidden_at: nil)
+                        else
+                          moderations.where(hidden_at: nil)
+          end
+        end
+      end
+
+      def reportable
+        @reportable ||= Decidim::Moderation.where(participatory_process: participatory_process).find(params[:id]).reportable
+      end
+    end
+  end
+end

data/decidim-admin/app/controllers/decidim/admin/newsletters_controller.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module Admin
-    # Controller that allows managing user groups at the admin panel.
+    # Controller that allows managing newsletters.
     #
     class NewslettersController < ApplicationController
       def index

data/decidim-admin/app/controllers/decidim/admin/participatory_process_groups_controller.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+require_dependency "decidim/admin/application_controller"
+
+module Decidim
+  module Admin
+    # Controller that allows managing participatory process groups.
+    #
+    class ParticipatoryProcessGroupsController < ApplicationController
+      helper_method :collection, :participatory_process_group
+
+      def index
+        authorize! :read, ParticipatoryProcessGroup
+      end
+
+      def show
+        authorize! :read, participatory_process_group
+      end
+
+      def new
+        authorize! :new, Decidim::ParticipatoryProcessGroup
+        @form = form(ParticipatoryProcessGroupForm).instance
+      end
+
+      def create
+        authorize! :new, Decidim::ParticipatoryProcessGroup
+        @form = form(ParticipatoryProcessGroupForm).from_params(params)
+
+        CreateParticipatoryProcessGroup.call(@form) do
+          on(:ok) do |participatory_process_group|
+            flash[:notice] = I18n.t("participatory_processes_group.create.success", scope: "decidim.admin")
+            redirect_to participatory_process_group_path(participatory_process_group)
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = I18n.t("participatory_processes_group.create.error", scope: "decidim.admin")
+            render :new
+          end
+        end
+      end
+
+      def edit
+        @participatory_process_group = collection.find(params[:id])
+        authorize! :update, @participatory_process_group
+        @form = form(ParticipatoryProcessGroupForm).from_model(@participatory_process_group)
+      end
+
+      def update
+        @participatory_process_group = collection.find(params[:id])
+        authorize! :update, @participatory_process_group
+        @form = form(ParticipatoryProcessGroupForm).from_params(params)
+
+        UpdateParticipatoryProcessGroup.call(@participatory_process_group, @form) do
+          on(:ok) do |participatory_process_group|
+            flash[:notice] = I18n.t("participatory_process_groups.update.success", scope: "decidim.admin")
+            redirect_to participatory_process_group_path(participatory_process_group)
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = I18n.t("participatory_process_groups.update.error", scope: "decidim.admin")
+            render :edit
+          end
+        end
+      end
+
+      def destroy
+        @participatory_process_group = collection.find(params[:id])
+        authorize! :destroy, @participatory_process_group
+        @participatory_process_group.destroy!
+
+        flash[:notice] = I18n.t("participatory_process_groups.destroy.success", scope: "decidim.admin")
+
+        redirect_to participatory_process_groups_path
+      end
+
+      private
+
+      def participatory_process_group
+        @participatory_process_group ||= Decidim::ParticipatoryProcessGroup.find(params[:id])
+      end
+
+      def collection
+        @collection ||= current_user.organization.participatory_process_groups
+      end
+    end
+  end
+end

data/decidim-admin/app/controllers/decidim/admin/participatory_process_publications_controller.rb

@@ -3,7 +3,7 @@ require_dependency "decidim/admin/application_controller"
 
 module Decidim
   module Admin
-    # Controller that allows managing all the Admins.
+    # Controller that allows managing participatory process publications.
     #
     class ParticipatoryProcessPublicationsController < ApplicationController
       include Concerns::ParticipatoryProcessAdmin

data/decidim-admin/app/controllers/decidim/admin/participatory_process_step_activations_controller.rb

@@ -3,7 +3,7 @@ require_dependency "decidim/admin/application_controller"
 
 module Decidim
   module Admin
-    # Controller that allows managing all the Admins.
+    # Controller that allows managing participatory process step activations.
     #
     class ParticipatoryProcessStepActivationsController < ApplicationController
       include Concerns::ParticipatoryProcessAdmin

data/decidim-admin/app/controllers/decidim/admin/participatory_process_step_ordering_controller.rb

@@ -3,7 +3,7 @@ require_dependency "decidim/admin/application_controller"
 
 module Decidim
   module Admin
-    # Controller that allows managing all the Admins.
+    # Controller that allows managing participatory process step ordering.
     #
     class ParticipatoryProcessStepOrderingController < ApplicationController
       include Concerns::ParticipatoryProcessAdmin

data/decidim-admin/app/controllers/decidim/admin/participatory_process_steps_controller.rb

@@ -3,7 +3,7 @@ require_dependency "decidim/admin/application_controller"
 
 module Decidim
   module Admin
-    # Controller that allows managing all the Admins.
+    # Controller that allows managing participatory process steps.
     #
     class ParticipatoryProcessStepsController < ApplicationController
       include Concerns::ParticipatoryProcessAdmin

data/decidim-admin/app/controllers/decidim/admin/participatory_process_user_roles_controller.rb

@@ -3,7 +3,7 @@ require_dependency "decidim/admin/application_controller"
 
 module Decidim
   module Admin
-    # Controller that allows managing all the Admins.
+    # Controller that allows managing participatory process user roles.
     #
     class ParticipatoryProcessUserRolesController < ApplicationController
       include Concerns::ParticipatoryProcessAdmin
@@ -18,13 +18,13 @@ module Decidim
         authorize! :create, Decidim::Admin::ParticipatoryProcessUserRole
         @form = form(ParticipatoryProcessUserRoleForm).from_params(params)
 
-        CreateParticipatoryProcessAdmin.call(@form, participatory_process) do
+        CreateParticipatoryProcessAdmin.call(@form, current_user, participatory_process) do
           on(:ok) do
             flash[:notice] = I18n.t("participatory_process_user_roles.create.success", scope: "decidim.admin")
           end
 
           on(:invalid) do
-            flash.now[:alert] = I18n.t("participatory_process_user_roles.create.error", scope: "decidim.admin")
+            flash[:alert] = I18n.t("participatory_process_user_roles.create.error", scope: "decidim.admin")
           end
           redirect_to participatory_process_user_roles_path(participatory_process)
         end

data/decidim-admin/app/controllers/decidim/admin/participatory_processes_controller.rb

@@ -3,11 +3,12 @@ require_dependency "decidim/admin/application_controller"
 
 module Decidim
   module Admin
-    # Controller that allows managing all the Admins.
+    # Controller that allows managing participatory processes.
     #
     class ParticipatoryProcessesController < ApplicationController
       helper_method :participatory_process
-      layout "decidim/admin/participatory_process", only: [:show, :edit]
+      helper Decidim::OrganizationScopesHelper
+      layout "decidim/admin/participatory_process", only: [:show, :edit, :update]
 
       def index
         authorize! :index, Decidim::ParticipatoryProcess

data/decidim-admin/app/forms/decidim/admin/organization_form.rb

@@ -10,6 +10,7 @@ module Decidim
       mimic :organization
 
       attribute :name, String
+      attribute :reference_prefix, String
       attribute :twitter_handler, String
       attribute :facebook_handler, String
       attribute :instagram_handler, String

data/decidim-admin/app/forms/decidim/admin/participatory_process_form.rb

@@ -11,7 +11,7 @@ module Decidim
       translatable_attribute :subtitle, String
       translatable_attribute :description, String
       translatable_attribute :short_description, String
-      translatable_attribute :scope, String
+      translatable_attribute :meta_scope, String
       translatable_attribute :developer_group, String
       translatable_attribute :local_area, String
       translatable_attribute :target, String
@@ -24,17 +24,28 @@ module Decidim
       attribute :slug, String
       attribute :hashtag, String
       attribute :promoted, Boolean
+      attribute :scope_id, Integer
       attribute :hero_image
       attribute :banner_image
+      attribute :participatory_process_group_id, Integer
 
       validates :slug, presence: true
       validates :title, :subtitle, :description, :short_description, translatable_presence: true
+      validates :scope, presence: true, if: proc { |object| object.scope_id.present? }
 
       validate :slug, :slug_uniqueness
 
       validates :hero_image, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } }, file_content_type: { allow: ["image/jpeg", "image/png"] }
       validates :banner_image, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } }, file_content_type: { allow: ["image/jpeg", "image/png"] }
 
+      def scope
+        @scope ||= current_organization.scopes.where(id: scope_id).first
+      end
+
+      def participatory_process_group
+        Decidim::ParticipatoryProcessGroup.where(id: participatory_process_group_id).first
+      end
+
       private
 
       def slug_uniqueness

data/decidim-admin/app/forms/decidim/admin/participatory_process_group_form.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+module Decidim
+  module Admin
+    # A form object used to create participatory process groups from the admin
+    # dashboard.
+    #
+    class ParticipatoryProcessGroupForm < Form
+      include TranslatableAttributes
+
+      translatable_attribute :name, String
+      translatable_attribute :description, String
+      attribute :participatory_process_ids, Array[Integer]
+
+      mimic :participatory_process_group
+
+      attribute :hero_image
+
+      validates :name, :description, translatable_presence: true
+
+      validates :hero_image, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } }, file_content_type: { allow: ["image/jpeg", "image/png"] }
+    end
+  end
+end

data/decidim-admin/app/forms/decidim/admin/participatory_process_step_form.rb

@@ -9,7 +9,6 @@ module Decidim
 
       translatable_attribute :title, String
       translatable_attribute :description, String
-      translatable_attribute :short_description, String
 
       mimic :participatory_process_step
 

data/decidim-admin/app/forms/decidim/admin/participatory_process_user_role_form.rb

@@ -7,9 +7,13 @@ module Decidim
     class ParticipatoryProcessUserRoleForm < Form
       mimic :participatory_process_user_role
 
+      attribute :name, String
       attribute :email, String
+      attribute :role, String
 
-      validates :email, presence: true
+      validates :email, :role, presence: true
+      validates :name, presence: true
+      validates :role, inclusion: { in: ParticipatoryProcessUserRole::ROLES }
     end
   end
 end

data/decidim-admin/app/helpers/decidim/admin/application_helper.rb

@@ -9,6 +9,7 @@ module Decidim
       include Decidim::HumanizeBooleansHelper
       include Decidim::AriaSelectedLinkToHelper
       include Decidim::MetaTagsHelper
+      include Decidim::MapHelper
 
       def title
         current_organization.name

data/decidim-admin/app/helpers/decidim/admin/process_groups_for_select_helper.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+module Decidim
+  module Admin
+    # This class contains helpers needed to format ParticipatoryProcessGroups
+    # in order to use them in select forms.
+    #
+    module ProcessGroupsForSelectHelper
+      # Public: A formatted collection of ParticipatoryProcessGroups to be used
+      # in forms.
+      #
+      # Returns an Array.
+      def process_groups_for_select
+        @process_groups_for_select ||=
+          current_organization.participatory_process_groups.map do |group|
+            [translated_attribute(group.name), group.id]
+          end
+      end
+    end
+  end
+end

data/decidim-admin/app/helpers/decidim/admin/processes_for_select_helper.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+module Decidim
+  module Admin
+    # This class contains helpers needed to format ParticipatoryProcesses
+    # in order to use them in select forms.
+    #
+    module ProcessesForSelectHelper
+      # Public: A formatted collection of ParticipatoryProcesses to be used
+      # in forms.
+      #
+      # Returns an Array.
+      def processes_for_select
+        @processes_for_select ||= current_organization.participatory_processes.map do |process|
+          [
+            translated_attribute(process.title),
+            process.id
+          ]
+        end
+      end
+    end
+  end
+end