tramway-admin 1.20.2 → 1.20.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a2390d02f234a6031e5d73c8bb61f41bd5c1a77283c37dbb41f1fed9dc1186d
-  data.tar.gz: 7e60ff75d36704556651ccc50da1eb734ae60df9a27ef12d79fd88acedf0f668
+  metadata.gz: 2fbd8838a49c3c9c03b5af113ae383fbd2a9a46b2ac769e9690937a4d0154895
+  data.tar.gz: 879e3c86f5dd890d0784c353731c43807baca57e509334845a6adf9a7c9665c9
 SHA512:
-  metadata.gz: 291eb2087dad80bcc5856234ed3a239a4dd60b083305723610f2434e163a16907b1c5fab842facb36e1925347ddf6d5a346f4ce73a5de611a9857ff8bac258e1
-  data.tar.gz: 7568b0bbb7222425137630a3b969b07b4cfdea6b5a6a766a6ba0840f0683b9b47175e0cadb6a22d39f43bf2a958e2fd6dd600c161469eb403aae24db766cf2b3
+  metadata.gz: e432310f7f6b100464fd2f01900d0d3a907d5e62cbe3e2b78fca12003204784423ca59fa610666d0320620e2d03962b18a66dc54b96688c5ddedd9603495e654
+  data.tar.gz: 679c2bbf440f72b9971076be923cc26fd90bd1e7854b78d1122bb070c21bd89cfd8cc74aa91f0022d072a93d6dba4a54640db96dfe0e1a20cbd758a7971cada4

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

@@ -8,24 +8,26 @@ module Tramway
       include Tramway::AuthManagement
       include RecordRoutesHelper
       before_action :authenticate_admin!
-      before_action :check_available!
-      before_action :collections_counts, if: :model_given?
-      before_action :check_available_scope!, if: :model_given?, only: :index
       before_action :application
       before_action :notifications
       before_action :notifications_count
+      before_action :collections_counts, if: :model_given?
+      before_action :check_available!
+      before_action :check_available_scope!, if: :model_given?, only: :index
 
       protect_from_forgery with: :exception
 
       protected
 
       def check_available!
-        render '/404' unless model_given?
+        unless model_given?
+          raise 'Model is not available'
+        end
       end
 
       def check_available_scope!
-        if params[:scope].present?
-          render '/404' unless available_scope_given?
+        if params[:scope].present? && !available_scope_given?
+          raise 'Scope is not available'
         end
       end
 
@@ -92,12 +94,18 @@ module Tramway
       end
 
       def available_models_given?
-        models = ::Tramway::Admin.available_models(role: current_user.role)
-        models.any? && params[:model].in?(models.map(&:to_s))
+        check_models_given? :available
       end
 
       def singleton_models_given?
-        ::Tramway::Admin.singleton_models.any? && params[:model].in?(::Tramway::Admin.singleton_models.map(&:to_s))
+        check_models_given? :singleton
+      end
+
+      private
+
+      def check_models_given?(model_type)
+        models = ::Tramway::Admin.send("#{model_type}_models", role: current_user.role)
+        models.any? && params[:model].in?(models.map(&:to_s))
       end
     end
   end

data/lib/tramway/admin/records_models.rb

@@ -11,8 +11,8 @@ module Tramway::Admin::RecordsModels
     models = get_models_by_key(@available_models, project, role)
     if project_is_engine?(project)
       models += engine_class(project).dependencies.map do |dependency|
-        if @available_models[dependency].present?
-          @available_models[dependency]
+        if @available_models[dependency][role].present?
+          @available_models[dependency][role]
         else
           error = Tramway::Error.new(
             plugin: :admin,

data/lib/tramway/admin/singleton_models.rb

@@ -4,6 +4,7 @@ module Tramway::Admin::SingletonModels
     @singleton_models[project] ||= {}
     @singleton_models[project][role] ||= []
     @singleton_models[project][role] += models
+    @singleton_models = @singleton_models.with_indifferent_access
   end
 
   def singleton_models_for(project, role: :admin)
@@ -16,7 +17,14 @@ module Tramway::Admin::SingletonModels
     models
   end
 
-  def singleton_models
-    @singleton_models&.values&.flatten || []
+  def singleton_models(role:)
+    if @singleton_models
+      @singleton_models.map do |projects|
+        projects[1][role]
+      end.flatten
+    else
+      error = Tramway::Error.new(plugin: :admin, method: :singleton_models, message: 'List of singleton_models is empty. You should add some of them using `::Tramway::Admin.set_singleton_models(*list_of_classes, project: :your_project_name)` in `config/initializers/tramway.rb`')
+      raise error.message
+    end
   end
 end

data/lib/tramway/admin/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Admin
-    VERSION = '1.20.2'
+    VERSION = '1.20.2.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 1.20.2
+  version: 1.20.2.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-21 00:00:00.000000000 Z
+date: 2020-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-kaminari-views