decidim-admin 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0a14ae577b8ee55f1acd219a7c201705721ac0b
-  data.tar.gz: cffdb14ae737f8f3f5a5f1b393700aa40e3c2110
+  metadata.gz: fce922e0089d9ed07326a1e94358d6ac0369e017
+  data.tar.gz: d0a2c99292b6107b85358a4903d67c321d3ab8cb
 SHA512:
-  metadata.gz: '099c3142bad2c42410bf25b3638189d17d60a73e0db7f3d9c0b8f2d7f6bbb0a09039727c35d38f9e2d9ac85d902cff1e4c14c62496ce4e05dd58a4815cb35d9d'
-  data.tar.gz: a0a2529a0834105d52116e479eee4c47d7382958179dfe9b963c44c07f20ba5b690cd12efe19a3606c4ecdd5af5dfc61415a1de1b11aaf9bd83d28bf9a5e472e
+  metadata.gz: d21005f8d249df1e0545514164aab9506f8b14b783ade310385cec5f605dd3a403099f8abb8dfa753e416346e3a4e071153db75207f747fca5a3e02e05ab7dac
+  data.tar.gz: 4da1945d5ebc6ca61de4dfdb3ccb02e008f0f6ec96de01b918ac2950de0b8dfa758d99d55556967d5d6f7f90f50d28e035912bdaab72dade8df32e30a6bd3685

data/app/controllers/concerns/decidim/admin/participatory_space_admin_context.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # This module contains all the logic needed for a controller to render a participatory space
+    # public layout. modqule ParticipatorySpaceAdminContext
+    module ParticipatorySpaceAdminContext
+      extend ActiveSupport::Concern
+
+      class_methods do
+        # Public: Called on a controller, it sets up all the surrounding methods to render a
+        # participatory space's admin template. It expects the method `current_participatory_space`
+        # to be defined, from which it will extract the participatory manifest.
+        #
+        # options - A hash used to modify the behavior of the layout. :only: - An array of actions
+        #         on which the layout will be applied.
+        #
+        # Returns nothing.
+        def participatory_space_admin_layout(options = {})
+          layout :layout, options
+          before_action :authorize_participatory_space, options
+        end
+      end
+
+      included do
+        include Decidim::NeedsOrganization
+        helper ParticipatorySpaceHelpers
+
+        helper_method :current_participatory_space
+        helper_method :current_participatory_space_manifest
+        helper_method :current_participatory_space_context
+
+        delegate :manifest, to: :current_participatory_space, prefix: true
+      end
+
+      private
+
+      def current_participatory_space_context
+        :admin
+      end
+
+      def current_participatory_space
+        raise NotImplementedError
+      end
+
+      def authorize_participatory_space
+        authorize! :read, current_participatory_space
+      end
+
+      def ability_context
+        super.merge(
+          current_participatory_space: current_participatory_space
+        )
+      end
+
+      def layout
+        current_participatory_space_manifest.context(current_participatory_space_context).layout
+      end
+    end
+  end
+end

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

@@ -5,8 +5,9 @@ module Decidim
     # Controller that allows managing categories.
     #
     class CategoriesController < Decidim::Admin::ApplicationController
-      helper_method :current_participatory_space
-
+      include ParticipatorySpaceAdminContext
+      participatory_space_admin_layout
+      
       def index
         authorize! :read, Decidim::Category
       end

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

@@ -8,6 +8,9 @@ module Decidim
       class BaseController < Admin::ApplicationController
         skip_authorize_resource
         include Settings
+        
+        include Decidim::Admin::ParticipatorySpaceAdminContext
+        participatory_space_admin_layout
 
         helper Decidim::ResourceHelper
         helper Decidim::Admin::ExportsHelper
@@ -16,10 +19,6 @@ module Decidim
                       :current_participatory_space,
                       :parent_path
 
-        before_action do
-          extend current_participatory_space.admin_extension_module
-        end
-
         before_action except: [:index, :show] do
           authorize! :manage, current_feature
         end

data/config/routes.rb

@@ -7,7 +7,7 @@ Decidim::Admin::Engine.routes.draw do
     end
 
     Decidim.participatory_space_manifests.each do |manifest|
-      mount manifest.admin_engine, at: "/", as: "decidim_admin_#{manifest.name}"
+      mount manifest.context(:admin).engine, at: "/", as: "decidim_admin_#{manifest.name}"
     end
 
     resources :static_pages

data/lib/decidim/admin/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-admin version.
   module Admin
     def self.version
-      "0.8.3"
+      "0.8.4"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-admin
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-15 00:00:00.000000000 Z
+date: 2018-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.4
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -130,28 +130,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.4
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.4
 description: Organization administration to manage a single organization.
 email:
 - josepjaume@gmail.com
@@ -265,6 +265,7 @@ files:
 - app/commands/decidim/admin/update_user_groups.rb
 - app/commands/decidim/admin/verify_user_group.rb
 - app/constraints/decidim/admin/organization_dashboard_constraint.rb
+- app/controllers/concerns/decidim/admin/participatory_space_admin_context.rb
 - app/controllers/decidim/admin/application_controller.rb
 - app/controllers/decidim/admin/authorization_workflows_controller.rb
 - app/controllers/decidim/admin/categories_controller.rb