tramway-admin 1.7.8.2 → 1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40fd11670e852d464d05f382575ea24c437fd73a7312bc5cd6d9ffc90b8dd1fa
-  data.tar.gz: ab278a56968e3d64c0c7a3ce85704aebe148ac5e1ebd38f11590f18da8cb213a
+  metadata.gz: 68806279d5c90ebac0bcba3b6bdc22cda7db8ea1006710ef06ddf3c17d7b38f9
+  data.tar.gz: eec348a9bd8ff22c02428fbaee5a936d6645f5b32a64db89aabbc0b3d8f35808
 SHA512:
-  metadata.gz: 3910b5b3fc7eb8f07300154872ae815bf5fb49e0f24e8ff1272815bfe04607102c14ec095a1988e20e135a1b464f99ac1c5d91543231632dad2c7e2fb3b5129f
-  data.tar.gz: 8f2a3067b9c204a59d208ce645bdb69e9059aa4d36d1bbbf6d8e06aa0e36de9a5521859357e047a0eaaa06024ee0654088692070db91424260fef8be683e91ae
+  metadata.gz: 300ad1e390bee15a6fe10ab6e4cda43b346a6c63b6c82e1d4c16d0c232cb5ea570593e8e1f0e1c3fdcf0560ab224e672aa0b0b417247929a9fc5af5e63503f07
+  data.tar.gz: 9f78d9ef1b3a839a0ce7d9d648368f8d2a707099f770b22d3c100019fb49b0f88b63458e6da7f077e60c37be50c85ace1d76cd6df31c0600ffc6b8fe9256ef0e

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

@@ -3,15 +3,15 @@
   - if ::Tramway::Admin.customized_admin_navbar.present?
     = ::Tramway::Admin.customized_admin_navbar
   - else
-    = link_to @application&.try(:title) || @application&.name || t('aplication.title'), ::Tramway::Admin::Engine.routes.url_helpers.root_path, class: 'navbar-brand'
+    = link_to @application&.try(:title) || @application&.public_name || t('aplication.title'), ::Tramway::Admin::Engine.routes.url_helpers.root_path, class: 'navbar-brand'
     %button.navbar-toggler.collapsed{ aria: { controls: :navbar, expanded: "false", label: 'Toggle Navigation' }, data: { target: "#navbar", toggle: :collapse }, type: :button }
       %span.navbar-toggler-icon
     .navbar-collapse.collapse#navbar
       - if signed_in?
         %ul.navbar-nav
-          - ::Tramway::Admin.singleton_models_for(@application_engine)&.each do |model|
+          - ::Tramway::Admin.singleton_models_for(@application_engine || @application.name)&.each do |model|
             = model_menu_item model: model, route: ::Tramway::Admin::Engine.routes.url_helpers.singleton_path(model: model)
-          - ::Tramway::Admin.available_models_for(@application_engine)&.each do |model|
+          - ::Tramway::Admin.available_models_for(@application_engine || @application.name)&.each do |model|
             = model_menu_item model: model, route: ::Tramway::Admin::Engine.routes.url_helpers.records_path(model: model, scope: decorator_class(model).collections.first)
       %ul.nav.navbar-nav.ml-auto
         - if signed_in?

data/app/views/tramway/admin/welcome/index.html.haml

@@ -1,3 +1,3 @@
-- title @application&.title
+- title
 %h1
-  = @application&.title
+  = @application&.try(:title) || @application&.name

data/lib/tramway/admin.rb

@@ -13,18 +13,22 @@ module Tramway
       end
 
       def available_models_for(project)
-        (@available_models[project.to_sym] || []) + "::Tramway::#{project.to_s.camelize}".constantize.dependencies.map do |dependency|
-          if @available_models[dependency].present?
-            @available_models[dependency]
-          else
-            error = Tramway::Error.new(
-              plugin: :admin,
-              method: :available_models_for,
-              message: "There is no dependency `#{dependency}` for plugin: #{project}. Please, check file `tramway-#{project}/lib/tramway/#{project}/#{project}.rb`"
-            )
-            raise error
-          end
-        end.flatten.compact
+        if project_is_engine?(project)
+          get_models_by_key(@available_models, project) + engine_class(project).dependencies.map do |dependency|
+            if @available_models[dependency].present?
+              @available_models[dependency]
+            else
+              error = Tramway::Error.new(
+                plugin: :admin,
+                method: :available_models_for,
+                message: "There is no dependency `#{dependency}` for plugin: #{project}. Please, check file `tramway-#{project}/lib/tramway/#{project}/#{project}.rb`"
+              )
+              raise error
+            end
+          end.flatten.compact
+        else
+          get_models_by_key(@available_models, project)
+        end
       end
 
       def available_models
@@ -43,9 +47,13 @@ module Tramway
       end
 
       def singleton_models_for(project)
-        (@singleton_models[project.to_sym] || []) + "::Tramway::#{project.to_s.camelize}".constantize.dependencies.map do |dependency|
-          @singleton_models[dependency]
-        end.flatten.compact
+        if project_is_engine?(project)
+          get_models_by_key(@singleton_models, project) + engine_class(project).dependencies.map do |dependency|
+            @singleton_models[dependency]
+          end.flatten.compact
+        else
+          get_models_by_key(singleton_models, project)
+        end
       end
 
       def singleton_models
@@ -65,6 +73,19 @@ module Tramway
       def customized_admin_navbar
         @customized_admin_navbar
       end
+
+      def engine_class(project)
+        class_name = "::Tramway::#{project.to_s.camelize}"
+        class_name.constantize if self.const_defined?(class_name)
+      end
+
+      def project_is_engine?(project)
+        engine_class(project)
+      end
+
+      def get_models_by_key(checked_models, project)
+        checked_models && checked_models != [] && checked_models[project.to_sym] || []
+      end
     end
   end
 end

data/lib/tramway/admin/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Admin
-    VERSION = '1.7.8.2'
+    VERSION = '1.8'
   end
 end

metadata

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