decidim-assemblies 0.20.0 → 0.23.1.rc1

data/app/commands/decidim/assemblies/admin/update_assembly.rb

@@ -62,10 +62,6 @@ module Decidim
             subtitle: form.subtitle,
             slug: form.slug,
             hashtag: form.hashtag,
-            hero_image: form.hero_image,
-            remove_hero_image: form.remove_hero_image,
-            banner_image: form.banner_image,
-            remove_banner_image: form.remove_banner_image,
             promoted: form.promoted,
             description: form.description,
             short_description: form.short_description,
@@ -84,7 +80,6 @@ module Decidim
             purpose_of_action: form.purpose_of_action,
             composition: form.composition,
             assembly_type: form.assembly_type,
-            assembly_type_other: form.assembly_type_other,
             creation_date: form.creation_date,
             created_by: form.created_by,
             created_by_other: form.created_by_other,
@@ -100,7 +95,16 @@ module Decidim
             instagram_handler: form.instagram_handler,
             youtube_handler: form.youtube_handler,
             github_handler: form.github_handler
-          }
+          }.merge(uploader_attributes)
+        end
+
+        def uploader_attributes
+          {
+            hero_image: form.hero_image,
+            remove_hero_image: form.remove_hero_image,
+            banner_image: form.banner_image,
+            remove_banner_image: form.remove_banner_image
+          }.delete_if { |_k, val| val.is_a?(Decidim::ApplicationUploader) }
         end
 
         def participatory_processes(assembly)
@@ -108,7 +112,7 @@ module Decidim
         end
 
         def link_participatory_processes(assembly)
-          assembly.link_participatory_spaces_resources(participatory_processes(assembly), "included_participatory_processes")
+          assembly.link_participatory_space_resources(participatory_processes(assembly), "included_participatory_processes")
         end
 
         # Resets the children counter cache to its correct value using an SQL count query.

data/app/commands/decidim/assemblies/admin/update_assembly_admin.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when updated a participatory
       # process admin in the system.
-      class UpdateAssemblyAdmin < Rectify::Command
+      class UpdateAssemblyAdmin < NotifyRoleAssignedToAssembly
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -45,6 +45,7 @@ module Decidim
             { role: form.role },
             log_info
           )
+          send_notification user_role.user
         end
       end
     end

data/app/controllers/concerns/decidim/assemblies/admin/filterable.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Assemblies
+    module Admin
+      module Filterable
+        extend ActiveSupport::Concern
+
+        included do
+          include Decidim::Admin::Filterable
+
+          private
+
+          # Unless we are explicitly looking for child assemblies, we filter them out.
+          def base_query
+            return collection if ransack_params[:parent_id_eq]
+
+            collection.parent_assemblies
+          end
+
+          def extra_filters
+            [:parent_id_eq]
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/assemblies/admin/assemblies_controller.rb

@@ -6,13 +6,13 @@ module Decidim
       # Controller that allows managing assemblies.
       #
       class AssembliesController < Decidim::Assemblies::Admin::ApplicationController
-        include Decidim::Paginable
-        helper_method :current_assembly, :parent_assembly, :parent_assemblies, :current_participatory_space, :query
+        include Decidim::Assemblies::Admin::Filterable
+        helper_method :current_assembly, :parent_assembly, :current_participatory_space
         layout "decidim/admin/assemblies"
 
         def index
           enforce_permission_to :read, :assembly_list
-          @assemblies = collection
+          @assemblies = filtered_collection
         end
 
         def new
@@ -28,7 +28,7 @@ module Decidim
           CreateAssembly.call(@form) do
             on(:ok) do |assembly|
               flash[:notice] = I18n.t("assemblies.create.success", scope: "decidim.admin")
-              redirect_to assemblies_path(parent_id: assembly.parent_id)
+              redirect_to assemblies_path(q: { parent_id_eq: assembly.parent_id })
             end
 
             on(:invalid) do
@@ -70,35 +70,20 @@ module Decidim
 
         private
 
-        def organization_assemblies
-          @organization_assemblies ||= OrganizationAssemblies.new(current_user.organization).query
-        end
-
-        def query
-          organization_assemblies
-            .where(parent_id: params[:parent_id])
-            .ransack(params[:q])
-        end
-
         def collection
-          @collection ||= paginate(query.result)
+          @collection ||= OrganizationAssemblies.new(current_user.organization).query
         end
 
         def current_assembly
-          scope = organization_assemblies
-          @current_assembly ||= scope.where(slug: params[:slug]).or(
-            scope.where(id: params[:slug])
+          @current_assembly ||= collection.where(slug: params[:slug]).or(
+            collection.where(id: params[:slug])
           ).first
         end
 
         alias current_participatory_space current_assembly
 
         def parent_assembly
-          @parent_assembly ||= organization_assemblies.find_by(id: params[:parent_id])
-        end
-
-        def parent_assemblies
-          @parent_assemblies ||= organization_assemblies.where.not(id: current_assembly)
+          @parent_assembly ||= collection.find_by(id: ransack_params[:parent_id_eq])
         end
 
         def assembly_params

data/app/controllers/decidim/assemblies/admin/assemblies_settings_controller.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      # Controller used to manage the assemblies settings for the current
+      # organization.
+      class AssembliesSettingsController < Decidim::Assemblies::Admin::ApplicationController
+        layout "decidim/admin/assemblies"
+
+        # GET /admin/assemblies_settings/edit
+        def edit
+          enforce_permission_to :edit, :assemblies_setting, assemblies_settings: current_assemblies_settings
+          @form = assemblies_settings_form.from_model(current_assemblies_settings)
+        end
+
+        # PUT /admin/assemblies_settings/:id
+        def update
+          enforce_permission_to :update, :assemblies_setting, assemblies_settings: current_assemblies_settings
+
+          @form = assemblies_settings_form
+                  .from_params(params, assemblies_settings: current_assemblies_settings)
+
+          UpdateAssembliesSetting.call(current_assemblies_settings, @form) do
+            on(:ok) do
+              flash[:notice] = I18n.t("assemblies_settings.update.success", scope: "decidim.admin")
+              redirect_to edit_assemblies_settings_path
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("assemblies_settings.update.error", scope: "decidim.admin")
+              render :edit
+            end
+          end
+        end
+
+        private
+
+        def current_assemblies_settings
+          @current_assemblies_settings ||= Decidim::AssembliesSetting.find_or_create_by!(decidim_organization_id: current_organization.id)
+        end
+
+        def assemblies_settings_form
+          form(Decidim::Assemblies::Admin::AssembliesSettingForm)
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/assemblies/admin/assemblies_types_controller.rb

@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      # Controller used to manage the available assemblies types for the current
+      # organization.
+      # As this substitues former i18n simple hash we need to keep these i18n keys for migrations
+      # and rollbakcs. So let i18n-tasks know about:
+      # i18n-tasks-use t('decidim.assemblies.assembly_types.government')
+      # i18n-tasks-use t('decidim.assemblies.assembly_types.commission')
+      # i18n-tasks-use t('decidim.assemblies.assembly_types.consultative_advisory')
+      # i18n-tasks-use t('decidim.assemblies.assembly_types.executive')
+      # i18n-tasks-use t('decidim.assemblies.assembly_types.others')
+      # i18n-tasks-use t('decidim.assemblies.assembly_types.participatory')
+      # i18n-tasks-use t('decidim.assemblies.assembly_types.working_group')
+      # This comment (and the i18n keys) may be removed in future versions
+      class AssembliesTypesController < Decidim::Assemblies::Admin::ApplicationController
+        helper_method :available_assemblies_types, :current_assembly_type
+        layout "decidim/admin/assemblies"
+
+        # GET /admin/assemblies_types
+        def index
+          enforce_permission_to :index, :assembly_type
+        end
+
+        # GET /admin/assemblies_types/new
+        def new
+          enforce_permission_to :create, :assembly_type
+          @form = assembly_type_form.instance
+        end
+
+        # POST /admin/assemblies_types
+        def create
+          enforce_permission_to :create, :assembly_type
+          @form = assembly_type_form.from_params(params)
+
+          CreateAssembliesType.call(@form) do
+            on(:ok) do |_assembly_type|
+              flash[:notice] = I18n.t("assemblies_types.create.success", scope: "decidim.admin")
+              redirect_to assemblies_types_path
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("assemblies_types.create.error", scope: "decidim.admin")
+              render :new
+            end
+          end
+        end
+
+        # GET /admin/assemblies_types/:id/edit
+        def edit
+          enforce_permission_to :edit, :assembly_type, assembly_type: current_assembly_type
+          @form = assembly_type_form
+                  .from_model(current_assembly_type,
+                              assembly_type: current_assembly_type)
+        end
+
+        # PUT /admin/assemblies_types/:id
+        def update
+          enforce_permission_to :update, :assembly_type, assembly_type: current_assembly_type
+
+          @form = assembly_type_form
+                  .from_params(params, assembly_type: current_assembly_type)
+
+          UpdateAssembliesType.call(current_assembly_type, @form) do
+            on(:ok) do
+              flash[:notice] = I18n.t("assemblies_types.update.success", scope: "decidim.admin")
+              redirect_to assemblies_types_path
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("assemblies_types.update.error", scope: "decidim.admin")
+              render :edit
+            end
+          end
+        end
+
+        # DELETE /admin/assemblies_types/:id
+        def destroy
+          enforce_permission_to :destroy, :assembly_type, assembly_type: current_assembly_type
+
+          DestroyAssembliesType.call(current_assembly_type, current_user) do
+            on(:ok) do
+              flash[:notice] = I18n.t("assemblies_types.destroy.success", scope: "decidim.admin")
+              redirect_to assemblies_types_path
+            end
+          end
+        end
+
+        private
+
+        def available_assemblies_types
+          @available_assemblies_types ||= AssembliesType.where(organization: current_organization)
+        end
+
+        def current_assembly_type
+          @current_assembly_type ||= AssembliesType.find(params[:id])
+        end
+
+        def assembly_type_form
+          form(Decidim::Assemblies::Admin::AssembliesTypeForm)
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/assemblies/admin/assembly_exports_controller.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      class AssemblyExportsController < Decidim::Admin::ApplicationController
+        include Concerns::AssemblyAdmin
+        include Decidim::Admin::ParticipatorySpaceExport
+
+        def exportable_space
+          current_assembly
+        end
+
+        def manifest_name
+          current_assembly.manifest.name.to_s
+        end
+
+        def after_export_path
+          assembly_path(current_assembly.slug)
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/assemblies/admin/assembly_imports_controller.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      class AssemblyImportsController < Decidim::Assemblies::Admin::ApplicationController
+        def new
+          enforce_permission_to :import, :assembly
+          @form = form(AssemblyImportForm).instance
+        end
+
+        def create
+          enforce_permission_to :import, :assembly
+          @form = form(AssemblyImportForm).from_params(params)
+
+          ImportAssembly.call(@form) do
+            on(:ok) do
+              flash[:notice] = I18n.t("assembly_imports.create.success", scope: "decidim.admin")
+              redirect_to assemblies_path
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("assembly_imports.create.error", scope: "decidim.admin")
+              render :new
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/assemblies/admin/assembly_user_roles_controller.rb

@@ -25,12 +25,13 @@ module Decidim
           CreateAssemblyAdmin.call(@form, current_user, current_assembly) do
             on(:ok) do
               flash[:notice] = I18n.t("assembly_user_roles.create.success", scope: "decidim.admin")
+              redirect_to assembly_user_roles_path(current_assembly)
             end
 
             on(:invalid) do
               flash[:alert] = I18n.t("assembly_user_roles.create.error", scope: "decidim.admin")
+              render :new
             end
-            redirect_to assembly_user_roles_path(current_assembly)
           end
         end
 

data/app/controllers/decidim/assemblies/assemblies_controller.rb

@@ -8,7 +8,7 @@ module Decidim
       participatory_space_layout only: :show
       include FilterResource
 
-      helper_method :parent_assemblies, :promoted_assemblies, :stats, :assembly_participatory_processes
+      helper_method :parent_assemblies, :promoted_assemblies, :stats, :assembly_participatory_processes, :current_assemblies_settings
 
       def index
         enforce_permission_to :list, :assembly
@@ -56,7 +56,7 @@ module Decidim
         {
           scope_id: nil,
           area_id: nil,
-          assembly_type: "all"
+          type_id: nil
         }
       end
 
@@ -87,6 +87,10 @@ module Decidim
       def assembly_participatory_processes
         @assembly_participatory_processes ||= @current_participatory_space.linked_participatory_space_resources(:participatory_processes, "included_participatory_processes")
       end
+
+      def current_assemblies_settings
+        @current_assemblies_settings ||= Decidim::AssembliesSetting.find_or_create_by(decidim_organization_id: current_organization.id)
+      end
     end
   end
 end

data/app/controllers/decidim/assemblies/{assembly_widgets_controller.rb → widgets_controller.rb}

@@ -2,7 +2,7 @@
 
 module Decidim
   module Assemblies
-    class AssemblyWidgetsController < Decidim::WidgetsController
+    class WidgetsController < Decidim::WidgetsController
       helper Decidim::SanitizeHelper
 
       private
@@ -16,7 +16,7 @@ module Decidim
       end
 
       def iframe_url
-        @iframe_url ||= assembly_assembly_widget_url(model)
+        @iframe_url ||= assembly_widget_url(model)
       end
     end
   end

data/app/events/decidim/assemblies/create_assembly_member_event.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    class CreateAssemblyMemberEvent < Decidim::Events::SimpleEvent
+      i18n_attributes :resource_name
+
+      def resource_name
+        @resource_name ||= translated_attribute(assembly.title)
+      end
+
+      def assembly
+        @assembly ||= resource
+      end
+    end
+  end
+end