tramway-admin 1.29.1 → 1.29.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00672d9c37c12d6db9a756f2c1b638db56573a8bac4c70800587ad7e0b940791
-  data.tar.gz: 016fd98a4e239d12b24f583a5e2c06f555a85eccfa93fef877c51539289c8071
+  metadata.gz: ed575a82aacf123ee4caeaab6eddf14ed35594decc07fd44789d4c0ee03d0a8b
+  data.tar.gz: 6098b5fe7138b6e9b102ac3e6ac87855d80e63540207a87398e4942ed476ca66
 SHA512:
-  metadata.gz: ce14fecc444d493d0b2edb9ff0014a9c392f81cf14bb01da2be6d398427a48d595a1d7609c605fb82f255ca4b8466833aa3923745429a2c78d4058de58b73d48
-  data.tar.gz: 275b6d832b5be2f9a894e111b8faf8faea832687482eb779b0a778b23898640142f3b998f4b90869e51bc1d6019f4b829ca8a6ec3c0d5fcb10d19518a303a51d
+  metadata.gz: 918f43cc0f9a3e7c3fad73769f22a6c03a9ff344e6c28c42439f54248cd890fe6f62894b12d2ee40c8bede75d79951ea6e2ac6fb525e5f5b798dd48c99d1a5f9
+  data.tar.gz: 81248e831e6ffa7698d4606bcde6310cc196ce5261c9c1dd729a0ace116f2a20ef8fea0d4ff5983609111240b5d84aae74e85d3eb9b99b2f149dac70f7017849

data/app/views/layouts/tramway/admin/shared/_navbar.html.haml

@@ -18,7 +18,7 @@
                 = model_menu_item model: model, route: ::Tramway::Admin::Engine.routes.url_helpers.singleton_path(model: model)
               - when :record
                 = model_menu_item model: model, route: ::Tramway::Admin::Engine.routes.url_helpers.records_path(model: model, scope: decorator_class(model).collections.first), pluralize: plural(model.model_name).capitalize
-            - when Symbol
+            - when Symbol, String
               = dropdown t("admin.navbar.links.#{item.keys.first}") do
                 - item.values.first.each do |sub_item|
                   - if sub_item == :divider

data/lib/tramway/admin.rb

@@ -39,11 +39,11 @@ module Tramway
           error = Tramway::Error.new(
             plugin: :admin,
             method: :get_models_by_key,
-            message: "Looks like you have not create at least one instance of #{Tramway::Core.application.model_class} model"
+            message: "Looks like you have not create at least one instance of #{Tramway::Core.application.model_class} model OR Tramway Application Model is nil"
           )
           raise error.message
         end
-        checked_models && checked_models != [] && checked_models[project][role]&.keys || []
+        checked_models && checked_models[project]&.dig(role)&.keys || []
       end
 
       def models_array(models_type:, role:)

data/lib/tramway/admin/navbar.rb

@@ -1,31 +1,31 @@
 # frozen_string_literal: true
 
 module Tramway::Admin::Navbar
-  def navbar_structure(*links)
-    @navbar_structure ||= links
+  def navbar_structure(*links, project:)
+    @navbar_structure ||= {}
+    @navbar_structure.merge! project => links
   end
 
   def navbar_items_for(project, role:)
-    @singleton_models_for = singleton_models_for(project, role: role)
-    @available_models_for = available_models_for(project, role: role)
-    navbar_structure.map do |item|
+    project = project.underscore.to_sym
+    @navbar_structure[project]&.map do |item|
       if item.is_a? Class
-        should_be_in_navbar_as item
+        should_be_in_navbar_as item, project, role
       elsif item.is_a? Hash
         sub_items = item.values.first.map do |sub_item|
-          should_be_in_navbar_as sub_item
+          should_be_in_navbar_as sub_item, project, role
         end.compact
         { item.keys.first => sub_items } if sub_items.any?
       end
-    end.compact
+    end&.compact || []
   end
 
   private
 
-  def should_be_in_navbar_as(item)
-    if @singleton_models_for.include?(item)
+  def should_be_in_navbar_as(item, project, role)
+    if singleton_models_for(project, role: role).include?(item)
       { item => :singleton }
-    elsif @available_models_for.include?(item)
+    elsif available_models_for(project, role: role).include?(item)
       { item => :record }
     elsif item.is_a? Symbol
       :divider

data/lib/tramway/admin/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Admin
-    VERSION = '1.29.1'
+    VERSION = '1.29.1.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 1.29.1
+  version: 1.29.1.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-10 00:00:00.000000000 Z
+date: 2020-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-kaminari-views