tramway-admin 1.23.0.2 → 1.23.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0de9655f49ca6678e764e63065446b147fbc8b2145a5609747cfbf714860cd73
-  data.tar.gz: f145c66fc91543ffe24527e9b5e1c68b73bac3fb94f836e641afd1239e06bec8
+  metadata.gz: e829ed2d89e8d5fd1473c6e9ee5b62e0575f5c75d60a7093847c6528c7dfa380
+  data.tar.gz: 0641cb8bb91d91f751d0aba568d0c31915ecf4832474889b0d791680bb4f9af4
 SHA512:
-  metadata.gz: 7bf84313ff9f2afcbc393c506c909341cb6f74688b20c93f23e7489068235dad3b264f7bef02454a6d0a34f54d14c1519952f3490c90a5b3d89658d228aed06f
-  data.tar.gz: a2b2565baa6c7bc0aca7329f668e08e2060e94b75289f90529609cd552b5ae45d3909f1a6767cba7bc22750a7a9db8e1c4d780dc3e9cd0b0c7a25bdb4e52666e
+  metadata.gz: ee3bfebb363dcbad9d0beee9ff640d7dbecec7c6894bd462c084cf5c5e2b3505cd54c6dc56481d33855b50889abded2274471a94ab1c04daf0a156a52eba6896
+  data.tar.gz: 6ff5398fd1251c97811667d05075d317f35ef668ed63a04a968c11c230ae7599957d17ba6213fcf81b1c6c975eb8efbcbb44b012317aead899418c5647ac79d5

data/app/assets/javascripts/tramway/admin/application.js.coffee

@@ -1,4 +1,7 @@
 #= require tramway/core/application
+#= require jquery
+#= require jquery_ujs
+#= require popper
 #= require bootstrap-sprockets
 #= require ckeditor/init
 #= require selectize

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

@@ -5,6 +5,7 @@ require 'tramway/helpers/class_name_helpers'
 module Tramway
   module Admin
     class ApplicationController < ::Tramway::Core::ApplicationController
+      include Tramway::ClassNameHelpers
       include Tramway::AuthManagement
       include RecordRoutesHelper
       before_action :authenticate_admin!

data/lib/tramway/admin.rb

@@ -31,11 +31,16 @@ module Tramway
       end
 
       def get_models_by_key(checked_models, project, role)
-        checked_models && checked_models != [] && checked_models[project][role] || []
+        checked_models && checked_models != [] && checked_models[project][role]&.keys || []
       end
 
       def models_array(models_type:, role:)
-        instance_variable_get("@#{models_type}_models")&.map { |projects| projects[1][role] }&.flatten || []
+        # FIXME projects[1] WHAT DA FUCK?!!!!
+        instance_variable_get("@#{models_type}_models")&.map { |projects| projects[1][role]&.keys }&.flatten || []
+      end
+
+      def action_is_available?(project:, role:, model:, action:)
+        @singleton_models[project][role][model][action]
       end
     end
   end

data/lib/tramway/admin/records_models.rb

@@ -4,8 +4,15 @@ module Tramway::Admin::RecordsModels
   def set_available_models(*models, project:, role: :admin)
     @available_models ||= {}
     @available_models[project] ||= {}
-    @available_models[project][role] ||= []
-    @available_models[project][role] += models
+    @available_models[project][role] ||= {}
+    models.each do |model|
+      case model.class
+      when Class
+        @available_models[project][role].merge! model => [ :index, :show, :update, :create, :destroy ]
+      when Hash
+        @available_models[project][role].merge! model
+      end
+    end
     @available_models = @available_models.with_indifferent_access
   end
 

data/lib/tramway/admin/singleton_models.rb

@@ -5,7 +5,14 @@ module Tramway::Admin::SingletonModels
     @singleton_models ||= {}
     @singleton_models[project] ||= {}
     @singleton_models[project][role] ||= []
-    @singleton_models[project][role] += models
+    models.each do |model|
+      case model.class
+      when Class
+        @available_models[project][role] << { model => [ :index, :show, :update, :create, :destroy ] }
+      when Hash
+        @available_models[project][role] << model
+      end
+    end
     @singleton_models = @singleton_models.with_indifferent_access
   end
 

data/lib/tramway/admin/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Admin
-    VERSION = '1.23.0.2'
+    VERSION = '1.23.0.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 1.23.0.2
+  version: 1.23.0.3
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-11 00:00:00.000000000 Z
+date: 2020-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-kaminari-views