tramway-admin 1.1.7 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51debb8a3c358a4e506ff8d44b55a192e1fbaee3cd69fe11ea5ee0a3cbc75027
-  data.tar.gz: b4f94aee6c047a100d58fcc2f1007814288ee7f72f1737ea092dc9c0d514ddb7
+  metadata.gz: f958353c638d04e501d274aaf555084edd43630474d63d5a7682f7a6b8565da7
+  data.tar.gz: 270474b2cbe1394790cbc4a6346737186c204dd03d750025adb2158946c418d0
 SHA512:
-  metadata.gz: 99afa4aa8d079d6ed94cf6f85961e24d77ea18e0d1ffe5c40e640a053260f96e7d409fe18b486d2f51f4a4c456a7e20ed36e4400cbdef7673dd45921e0df004d
-  data.tar.gz: db1ab9d05378bcfcdc3c62d6f8457cdba72fc3b1d99dba3b047e4659f1d9c30730724fe449f3b17194b0f1abb00a26ca5b1b60b36db9006d28730316b720c07e
+  metadata.gz: 4ca5455bd4191f663f6186e007d93f53f8fd9c2eb68289a8d409756bc75c2ad6bbee1f56781d9df2789585a94d53d56a2f5aca164546990a4deb01c2aeb396d2
+  data.tar.gz: b0a7c65aed9447ebe1171445b832946bdca147d3721f7f098f44cbc221502dc66ef82e925b7f198dc55a980c509792a3a0532c69b69ba6347756d1457d8b4edd

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

@@ -54,11 +54,11 @@ module Tramway
       end
 
       def available_models_given?
-        ::Tramway::Admin.available_models && params[:model].in?(::Tramway::Admin.available_models.map(&:to_s))
+        ::Tramway::Admin.available_models.any? && params[:model].in?(::Tramway::Admin.available_models.map(&:to_s))
       end
 
       def singleton_models_given?
-        ::Tramway::Admin.singleton_models && params[:model].in?(::Tramway::Admin.singleton_models.map(&:to_s))
+        ::Tramway::Admin.singleton_models.any? && params[:model].in?(::Tramway::Admin.singleton_models.map(&:to_s))
       end
     end
   end

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

@@ -1,14 +1,15 @@
 %nav.navbar.navbar-expand-md.navbar-dark.bg-dark
-  - if customized_admin_navbar_given?
-    = customized_admin_navbar
+  -# FIXME use helper methods
+  - if ::Tramway::Admin.customized_admin_navbar.present?
+    = ::Tramway::Admin.customized_admin_navbar
   - else
     = link_to @application&.title || t('application.title'), try(:root_path) || '/', class: 'navbar-brand'
     .navbar-collapse.collapse
       - if signed_in?
         %ul.navbar-nav
-          - ::Tramway::Admin.singleton_models&.each do |model|
+          - ::Tramway::Admin.singleton_models_for(@application_engine)&.each do |model|
             = model_menu_item model: model, route: ::Tramway::Admin::Engine.routes.url_helpers.singleton_path(model: model)
-          - ::Tramway::Admin.available_models&.each do |model|
+          - ::Tramway::Admin.available_models_for(@application_engine)&.each do |model|
             = model_menu_item model: model, route: ::Tramway::Admin::Engine.routes.url_helpers.records_path(model: model)
       %ul.nav.navbar-nav.ml-auto
         - if signed_in?

data/app/views/tramway/admin/records/show.html.haml

@@ -7,7 +7,7 @@
       %h1
         = current_title
         = link_to fa_icon(:pencil), edit_current_model_record_path(@record.id), class: 'btn btn-warning btn-xs'
-        = ::Tramway::Admin.additional_buttons(record: @record.model.model_name, view: :show)
+        = ::Tramway::Admin.additional_buttons(record: @record.model.model_name, view: :show, project: @application_engine)
 %hr
 .row
   %table.table.table-striped.table-bordered

data/lib/tramway/admin.rb

@@ -5,30 +5,45 @@ module Tramway
 
   module Admin
     class << self
-      def set_available_models(*models)
-        @available_models ||= []
-        @available_models += models
+      def set_available_models(*models, project:)
+        @available_models ||= {}
+        @available_models[project] ||= []
+        @available_models[project] += models
+      end
+
+      def available_models_for(project)
+        (@available_models[project.to_sym] || []) + "::Tramway::#{project.to_s.camelize}".constantize.dependencies.map do |dependency|
+          @available_models[dependency]
+        end.flatten.compact
       end
 
       def available_models
-        @available_models
+        @available_models.values.flatten
+      end
+
+      def set_singleton_models(*models, project:)
+        @singleton_models ||= {}
+        @singleton_models[project] ||= []
+        @singleton_models[project] += models
       end
 
-      def set_singleton_models(*models)
-        @singleton_models ||= []
-        @singleton_models += models
+      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
       end
 
       def singleton_models
-        @singleton_models
+        @singleton_models.values.flatten
       end
 
-      def set_additional_buttons(buttons)
+      def set_additional_buttons(buttons, project:)
         @additional_buttons ||= {}
-        @additional_buttons.merge! buttons
+        @additional_buttons[project] ||= {}
+        @additional_buttons[project].merge! buttons
       end
 
-      def additional_buttons(view: nil, record: nil)
+      def additional_buttons(project:, view: nil, record: nil)
         @additional_buttons&.dig record, view
       end
 

data/lib/tramway/admin/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Admin
-    VERSION = '1.1.7'
+    VERSION = '1.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: '1.2'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-23 00:00:00.000000000 Z
+date: 2018-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tramway-user