tramway-admin 1.20.2.1 → 1.20.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fbd8838a49c3c9c03b5af113ae383fbd2a9a46b2ac769e9690937a4d0154895
-  data.tar.gz: 879e3c86f5dd890d0784c353731c43807baca57e509334845a6adf9a7c9665c9
+  metadata.gz: 2a7ba6b7f9e8486df416e62844d44ea56a71adbe37ee912622c2eadb77472157
+  data.tar.gz: 9ebcf2da691261df493cdb7455407cee716a5c4d3b808a9140f2212ee9871716
 SHA512:
-  metadata.gz: e432310f7f6b100464fd2f01900d0d3a907d5e62cbe3e2b78fca12003204784423ca59fa610666d0320620e2d03962b18a66dc54b96688c5ddedd9603495e654
-  data.tar.gz: 679c2bbf440f72b9971076be923cc26fd90bd1e7854b78d1122bb070c21bd89cfd8cc74aa91f0022d072a93d6dba4a54640db96dfe0e1a20cbd758a7971cada4
+  metadata.gz: 0c8333b4588d950e73c1db4c54bc37a8b0c62c08445bfe730529f8359871d81b756160ee029e2ff8c37af47dbe41893a6a0b1e3dc550af7546773d1e6ffffe89
+  data.tar.gz: d325443c299043dc28526de61b84e37ad2d229713aec575030f37e4cf66602b3cbcfa9d9f188c5c31964d89e32b64f2657579b71815045c8ab09556fe83125d1

data/lib/tramway/admin.rb

@@ -31,6 +31,10 @@ module Tramway
       def get_models_by_key(checked_models, project, role)
         checked_models && checked_models != [] && checked_models[project][role] || []
       end
+
+      def models_array(models_type:, role:)
+        instance_variable_get("@#{models_type}_models")&.map { |projects| projects[1][role] }&.flatten || []
+      end
     end
   end
 end

data/lib/tramway/admin/records_models.rb

@@ -27,13 +27,6 @@ module Tramway::Admin::RecordsModels
   end
 
   def available_models(role:)
-    if @available_models
-      @available_models.map do |projects|
-        projects[1][role]
-      end.flatten
-    else
-      error = Tramway::Error.new(plugin: :admin, method: :available_models, message: 'List of available_models is empty. You should add some of them using `::Tramway::Admin.set_available_models(*list_of_classes, project: :your_project_name)` in `config/initializers/tramway.rb`')
-      raise error.message
-    end
+    models_array models_type: :available, role: role
   end
 end

data/lib/tramway/admin/singleton_models.rb

@@ -18,13 +18,6 @@ module Tramway::Admin::SingletonModels
   end
 
   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
+    models_array models_type: :singleton, role: role
   end
 end

data/lib/tramway/admin/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 1.20.2.1
+  version: 1.20.2.2
 platform: ruby
 authors:
 - Pavel Kalashnikov