decidim-admin 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 612edd39b9ceea98757e9849835208686b212aed
-  data.tar.gz: 775f0d302009035a3d1d91f1b857ebb84afffecf
+  metadata.gz: 2c04a5698dcc71c7bda864b3e2e1ad1dc71882b6
+  data.tar.gz: 806b372b8d5c035db984dcde250d9124eb5aa959
 SHA512:
-  metadata.gz: 4c68dbac4e15f09abb37c9156bd601f7e89d3f46d8c31831cf8cfc3a8874225fafa7d8deaec3766e24a3bdc7f1912514b6c1963e6479e4c82b2be8f39772f445
-  data.tar.gz: b1dcb942f19bc1aec661b7c4db5585b80f4a9383214b3017a3e076e8398f9f8063c250898b64e0bd411cebd7caf6cfa5b0dd4e2b3a840b0253c8103d90b21705
+  metadata.gz: e4e78726fdbeffba1faec39969af27b2be307b23d429106493a79ee324b7c57cc24a279ae715b4f47f0b7477ce898499d4ffdb53323e6a9391ed6615a12dd805
+  data.tar.gz: 56b59193bec6a7c7a189cbce4a465fa202653edc9320c85194d555deebbedac1452e3e0a62a8987666e3f0bbb5c6a1c156c21df5beb1ea4f3aa99348562c7739

data/README.md

@@ -21,13 +21,6 @@ $ bundle
 
 ## Features
 
-### Participatory process
-
-Here you can manage participatory processes.
-
-TODO: Elaborate on this.
-
-
 ### Static pages
 
 This feature allows an admin to create pages to serve static content. Some

data/app/assets/javascripts/decidim/admin/application.js.es6

@@ -10,7 +10,6 @@
 // = require moment.min
 // = require ./select2
 // = require ./scopes
-// = require ./participatory_processes
 // = require_self
 
 window.Decidim = window.Decidim || {};

data/app/assets/stylesheets/decidim/admin/extra/_quill.scss

@@ -0,0 +1,5 @@
+.ql-disabled {
+  .ql-editor {
+    background: #eee;
+  }
+}

data/app/commands/decidim/admin/create_category.rb

@@ -8,11 +8,11 @@ module Decidim
       # Public: Initializes the command.
       #
       # form - A form object with the params.
-      # participatory_process - The ParticipatoryProcess that will hold the
+      # participatory_space - The participatory space that will hold the
       #   category
-      def initialize(form, participatory_process)
+      def initialize(form, participatory_space)
         @form = form
-        @participatory_process = participatory_process
+        @participatory_space = participatory_space
       end
 
       # Executes the command. Broadcasts these events:
@@ -37,7 +37,7 @@ module Decidim
           name: form.name,
           description: form.description,
           parent_id: form.parent_id,
-          participatory_process: @participatory_process
+          participatory_space: @participatory_space
         )
       end
     end

data/app/commands/decidim/admin/create_feature.rb

@@ -4,17 +4,17 @@ module Decidim
   module Admin
     # This command gets called when a feature is created from the admin panel.
     class CreateFeature < Rectify::Command
-      attr_reader :form, :manifest, :participatory_process
+      attr_reader :form, :manifest, :participatory_space
 
       # Public: Initializes the command.
       #
-      # manifest              - The feature's manifest to create a feature from.
-      # form                  - The form from which the data in this feature comes from.
-      # participatory_process - The participatory process that will hold this feature.
-      def initialize(manifest, form, participatory_process)
+      # manifest            - The feature's manifest to create a feature from.
+      # form                - The form from which the data in this feature comes from.
+      # participatory_space - The participatory space that will hold this feature.
+      def initialize(manifest, form, participatory_space)
         @manifest = manifest
         @form = form
-        @participatory_process = participatory_process
+        @participatory_space = participatory_space
       end
 
       # Public: Creates the Feature.
@@ -37,7 +37,7 @@ module Decidim
         @feature = Feature.create!(
           manifest_name: manifest.name,
           name: form.name,
-          participatory_process: participatory_process,
+          participatory_space: participatory_space,
           settings: form.settings,
           default_step_settings: form.default_step_settings,
           step_settings: form.step_settings

data/app/commands/decidim/admin/create_managed_user.rb

@@ -39,8 +39,6 @@ module Decidim
           organization: form.current_organization,
           admin: false,
           managed: true,
-          comments_notifications: true,
-          replies_notifications: true,
           tos_agreement: true
         )
       end

data/app/commands/decidim/admin/update_organization.rb

@@ -65,6 +65,7 @@ module Decidim
           official_img_footer: form.official_img_footer,
           remove_official_img_footer: form.remove_official_img_footer,
           official_url: form.official_url,
+          header_snippets: form.header_snippets,
           show_statistics: form.show_statistics
         }
       end

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

@@ -13,8 +13,6 @@ module Decidim
       helper Decidim::Admin::ApplicationHelper
       helper Decidim::Admin::AttributesDisplayHelper
       helper Decidim::Admin::SettingsHelper
-      helper Decidim::Admin::ProcessGroupsForSelectHelper
-      helper Decidim::Admin::ProcessesForSelectHelper
       helper Decidim::Admin::IconLinkHelper
       helper Decidim::Admin::MenuHelper
       helper Decidim::Admin::ScopesHelper

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

@@ -5,7 +5,7 @@ module Decidim
     # Controller that allows managing categories.
     #
     class CategoriesController < Decidim::Admin::ApplicationController
-      include Concerns::ParticipatoryProcessAdmin
+      helper_method :current_participatory_space
 
       def index
         authorize! :read, Decidim::Category
@@ -13,17 +13,17 @@ module Decidim
 
       def new
         authorize! :create, Decidim::Category
-        @form = form(CategoryForm).from_params({}, current_process: current_participatory_process)
+        @form = form(CategoryForm).from_params({}, current_participatory_space: current_participatory_space)
       end
 
       def create
         authorize! :create, Decidim::Category
-        @form = form(CategoryForm).from_params(params, current_process: current_participatory_process)
+        @form = form(CategoryForm).from_params(params, current_participatory_space: current_participatory_space)
 
-        CreateCategory.call(@form, current_participatory_process) do
+        CreateCategory.call(@form, current_participatory_space) do
           on(:ok) do
             flash[:notice] = I18n.t("categories.create.success", scope: "decidim.admin")
-            redirect_to categories_path(current_participatory_process)
+            redirect_to categories_path(current_participatory_space)
           end
 
           on(:invalid) do
@@ -36,18 +36,18 @@ module Decidim
       def edit
         @category = collection.find(params[:id])
         authorize! :update, @category
-        @form = form(CategoryForm).from_model(@category, current_process: current_participatory_process)
+        @form = form(CategoryForm).from_model(@category, current_participatory_space: current_participatory_space)
       end
 
       def update
         @category = collection.find(params[:id])
         authorize! :update, @category
-        @form = form(CategoryForm).from_params(params, current_process: current_participatory_process)
+        @form = form(CategoryForm).from_params(params, current_participatory_space: current_participatory_space)
 
         UpdateCategory.call(@category, @form) do
           on(:ok) do
             flash[:notice] = I18n.t("categories.update.success", scope: "decidim.admin")
-            redirect_to categories_path(current_participatory_process)
+            redirect_to categories_path(current_participatory_space)
           end
 
           on(:invalid) do
@@ -75,14 +75,14 @@ module Decidim
             flash[:alert] = I18n.t("categories.destroy.error", scope: "decidim.admin")
           end
 
-          redirect_back(fallback_location: categories_path(current_participatory_process))
+          redirect_back(fallback_location: categories_path(current_participatory_space))
         end
       end
 
       private
 
       def collection
-        @collection ||= current_participatory_process.categories.includes(:subcategories)
+        @collection ||= current_participatory_space.categories.includes(:subcategories)
       end
     end
   end

data/app/controllers/decidim/admin/exports_controller.rb

@@ -4,7 +4,6 @@ module Decidim
   module Admin
     # This controller allows admins to manage proposals in a participatory process.
     class ExportsController < Decidim::Admin::ApplicationController
-      include Concerns::ParticipatoryProcessAdmin
       include Decidim::FeaturePathHelper
 
       def create
@@ -25,7 +24,7 @@ module Decidim
       end
 
       def feature
-        @feature ||= current_participatory_process.features.find(params[:feature_id])
+        @feature ||= current_participatory_space.features.find(params[:feature_id])
       end
     end
   end

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

@@ -5,7 +5,6 @@ module Decidim
     # Controller that allows managing feature permissions.
     #
     class FeaturePermissionsController < Decidim::Admin::ApplicationController
-      include Concerns::ParticipatoryProcessAdmin
       helper_method :authorizations, :feature
 
       def edit
@@ -22,7 +21,7 @@ module Decidim
         UpdateFeaturePermissions.call(@permissions_form, feature) do
           on(:ok) do
             flash[:notice] = t("feature_permissions.update.success", scope: "decidim.admin")
-            redirect_to features_path(current_participatory_process)
+            redirect_to features_path(current_participatory_space)
           end
 
           on(:invalid) do
@@ -51,7 +50,7 @@ module Decidim
       end
 
       def feature
-        @feature ||= current_participatory_process.features.find(params[:feature_id])
+        @feature ||= current_participatory_space.features.find(params[:feature_id])
       end
     end
   end

data/app/controllers/decidim/admin/features/base_controller.rb

@@ -7,16 +7,18 @@ module Decidim
       # controllers in their admin engines should inherit from.
       class BaseController < Admin::ApplicationController
         skip_authorize_resource
-        include Concerns::ParticipatoryProcessAdmin
         include Settings
 
         helper Decidim::ResourceHelper
         helper Decidim::Admin::ExportsHelper
 
         helper_method :current_feature,
+                      :current_participatory_space,
                       :parent_path
 
-        delegate :active_step, to: :current_participatory_process, prefix: false
+        before_action do
+          extend current_participatory_space.admin_extension_module
+        end
 
         before_action except: [:index, :show] do
           authorize! :manage, current_feature
@@ -30,8 +32,12 @@ module Decidim
           request.env["decidim.current_feature"]
         end
 
+        def current_participatory_space
+          current_feature.participatory_space
+        end
+
         def parent_path
-          decidim_admin.features_path(current_participatory_process)
+          @parent_path ||= EngineRouter.admin_proxy(current_participatory_space).features_path
         end
       end
     end

data/app/controllers/decidim/admin/features_controller.rb

@@ -6,14 +6,12 @@ module Decidim
     # admin panel.
     #
     class FeaturesController < Decidim::Admin::ApplicationController
-      include Concerns::ParticipatoryProcessAdmin
-
-      helper_method :manifest
+      helper_method :manifest, :current_participatory_space
 
       def index
         authorize! :read, Feature
         @manifests = Decidim.feature_manifests
-        @features = current_participatory_process.features
+        @features = current_participatory_space.features
       end
 
       def new
@@ -22,7 +20,7 @@ module Decidim
         @feature = Feature.new(
           name: default_name(manifest),
           manifest_name: params[:type],
-          participatory_process: current_participatory_process
+          participatory_space: current_participatory_space
         )
 
         @form = form(FeatureForm).from_model(@feature)
@@ -32,7 +30,7 @@ module Decidim
         @form = form(FeatureForm).from_params(params)
         authorize! :create, Feature
 
-        CreateFeature.call(manifest, @form, current_participatory_process) do
+        CreateFeature.call(manifest, @form, current_participatory_space) do
           on(:ok) do
             flash[:notice] = I18n.t("features.create.success", scope: "decidim.admin")
             redirect_to action: :index
@@ -110,7 +108,7 @@ module Decidim
       private
 
       def query_scope
-        current_participatory_process.features
+        current_participatory_space.features
       end
 
       def manifest

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

@@ -4,8 +4,6 @@ module Decidim
   module Admin
     # This controller allows admins to manage moderations in a participatory process.
     class ModerationsController < Decidim::Admin::ApplicationController
-      include Concerns::ParticipatoryProcessAdmin
-
       helper_method :moderations
 
       def index
@@ -49,19 +47,19 @@ module Decidim
       def moderations
         @moderations ||= begin
           if params[:hidden]
-            participatory_process_moderations.where.not(hidden_at: nil)
+            participatory_space_moderations.where.not(hidden_at: nil)
           else
-            participatory_process_moderations.where(hidden_at: nil)
+            participatory_space_moderations.where(hidden_at: nil)
           end
         end
       end
 
       def reportable
-        @reportable ||= participatory_process_moderations.find(params[:id]).reportable
+        @reportable ||= participatory_space_moderations.find(params[:id]).reportable
       end
 
-      def participatory_process_moderations
-        @participatory_process_moderations ||= Decidim::Moderation.where(participatory_process: current_participatory_process)
+      def participatory_space_moderations
+        @participatory_space_moderations ||= Decidim::Moderation.where(participatory_space: current_participatory_space)
       end
     end
   end

data/app/controllers/decidim/admin/scopes_controller.rb

@@ -10,11 +10,7 @@ module Decidim
 
       def index
         authorize! :index, Scope
-        @scopes = if parent_scope
-                    parent_scope.children
-                  else
-                    collection.top_level
-                  end
+        @scopes = children_scopes.order("name->'#{I18n.locale}' ASC")
       end
 
       def new
@@ -71,16 +67,22 @@ module Decidim
 
       private
 
-      def scope
-        @scope ||= collection.find(params[:id])
+      def organization_scopes
+        current_organization.scopes
       end
 
       def parent_scope
-        @parent_scope ||= @scope ? @scope.parent : collection.find_by_id(params[:scope_id])
+        return @parent_scope if defined?(@parent_scope)
+        @parent_scope = scope ? scope.parent : organization_scopes.find_by_id(params[:scope_id])
       end
 
-      def collection
-        current_organization.scopes
+      def scope
+        return @scope if defined?(@scope)
+        @scope = organization_scopes.find_by_id(params[:id])
+      end
+
+      def children_scopes
+        @subscopes ||= parent_scope ? parent_scope.children : organization_scopes.top_level
       end
 
       def current_scopes_path

data/app/controllers/decidim/admin/users_controller.rb

@@ -21,9 +21,7 @@ module Decidim
         default_params = {
           organization: current_organization,
           invitation_instructions: "invite_admin",
-          invited_by: current_user,
-          comments_notifications: true,
-          replies_notifications: true
+          invited_by: current_user
         }
 
         @form = form(InviteUserForm).from_params(params.merge(default_params))

data/app/forms/decidim/admin/category_form.rb

@@ -16,10 +16,10 @@ module Decidim
       validates :name, :description, translatable_presence: true
       validates :parent_id, inclusion: { in: :parent_categories_ids }, allow_blank: true
 
-      delegate :current_process, to: :context, prefix: false
+      delegate :current_participatory_space, to: :context, prefix: false
 
       def parent_categories
-        @parent_categories ||= current_process.categories.first_class.where.not(id: id)
+        @parent_categories ||= current_participatory_space.categories.first_class.where.not(id: id)
       end
 
       private

data/app/forms/decidim/admin/feature_form.rb

@@ -19,13 +19,7 @@ module Decidim
       attribute :weight, Integer, default: 0
 
       attribute :step_settings, Hash[String => Object]
-      attribute :participatory_process
-
-      def map_model(model)
-        self.attributes = model.attributes
-        self.settings = model.settings
-        self.default_step_settings = model.default_step_settings
-      end
+      attribute :participatory_space
 
       def settings?
         settings.manifest.attributes.any?
@@ -34,17 +28,6 @@ module Decidim
       def default_step_settings?
         default_step_settings.manifest.attributes.any?
       end
-
-      def step_settings?
-        return false unless participatory_process.steps.any?
-
-        step_settings
-          .values
-          .map(&:manifest)
-          .flat_map(&:attributes)
-          .flat_map(&:keys)
-          .any?
-      end
     end
   end
 end