tramway-admin 1.24.0.3 → 1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8eda1f6e8bd50ccd58ecd499430f865dc8a7a3eea2ffb1111bd54c401926f03a
-  data.tar.gz: e0cabe64036fbaa4ce9372ca6941c11d62a124f44c257213a9baec475b4e3d20
+  metadata.gz: 7852be8e1252b1898b91dfa9d2cb59ea27964a5324dfe28f853b8246c4128f4d
+  data.tar.gz: 93324c1d3e853a2c2c7f8e44f850af44e1235282b67ae27ea3b3a996fa09bcc6
 SHA512:
-  metadata.gz: ee933112ded2c183e5bb5fe0fc8237cd366874fded372b50691cc66392eb8c8a45f75a353697486376daf3cd1fffe77369f03abe093ba10330ebc62bb3fba618
-  data.tar.gz: 3ac64984136c06f798cbccf50361ef4de7079454749bfed95db827b12c624abd279346a23692c63057f7e8faba782d1d094589c371c7c1ffbb0a1a60dc2dcd5b
+  metadata.gz: c111155d6b7bc46989c9d744e9404a59e7a0a1894d3ad9eabd0e25616891e22368d8602d141c9a9891efe15cf3fc803e0369c23c50f37b031102547672a93622
+  data.tar.gz: c748a1042f1c39311b6042a4ab79a241b142611182c7c6819ed7ead59896989a8130035575bdf078d4143f14194cea87c2e77e972bc49a49358274fbf2a5da55

data/app/views/tramway/admin/shared/show/_associations.html.haml

@@ -4,6 +4,7 @@
       = model_class.human_attribute_name association.name
       %hr
       = link_to "#{I18n.t('helpers.actions.add')} #{model_class.human_attribute_name(association.name).singularize.downcase}", new_associated_record_path(association: association, object: object, as: object.send("#{association.name}_as")), class: 'btn btn-primary'
+    - association_state_machines = object.send("#{association.name}_state_machines")
     %td{ colspan: 2 }
       %table.table.table-striped.table-bordered
         - object.send(association.name)&.each do |association_object|
@@ -12,6 +13,9 @@
               = association_object.id
             %td
               = link_to association_object.name, record_path(association_object.id, model: association.options[:class_name])
+            %td
+              - association_state_machines.each do |state_method|
+                = state_events_buttons association_object, state_method: state_method, model_param_name: :record, controller: 'tramway/admin/records', action: :update, parameters: { redirect: current_model_record_path(object.id), model: association_object.class.model_name }, button_options: { class: :smart_button }
             %td
               - if ::Tramway::Admin.action_is_available?(association_object, project: (@application_engine || @application.name), model: association_object.model.class, role: current_user.role, action: :destroy)
                 = delete_button url: record_path(association_object.id, model: association.options[:class_name], redirect: current_model_record_path(object.id)), button_options: { class: 'btn btn-xs btn-danger' } do

data/lib/tramway/admin.rb

@@ -35,8 +35,9 @@ module Tramway
       end
 
       def models_array(models_type:, role:)
-        # FIXME projects[1] WHAT DA FUCK?!!!!
-        instance_variable_get("@#{models_type}_models")&.map { |projects| projects[1][role]&.keys }&.flatten || []
+        instance_variable_get("@#{models_type}_models")&.map do |projects|
+          projects.last[role]&.keys
+        end&.flatten || []
       end
 
       def action_is_available?(record, project:, role:, model:, action:)

data/lib/tramway/admin/records_models.rb

@@ -19,8 +19,8 @@ module Tramway::Admin::RecordsModels
     models = get_models_by_key(@available_models, project, role)
     if project_is_engine?(project)
       models += engine_class(project).dependencies.map do |dependency|
-        if @available_models[dependency][role].present?
-          @available_models[dependency][role]
+        if @available_models&.dig(dependency, role).present?
+          @available_models&.dig(dependency, role).keys
         else
           error = Tramway::Error.new(
             plugin: :admin,

data/lib/tramway/admin/singleton_models.rb

@@ -4,12 +4,12 @@ module Tramway::Admin::SingletonModels
   def set_singleton_models(*models, project:, role: :admin)
     @singleton_models ||= {}
     @singleton_models[project] ||= {}
-    @singleton_models[project][role] ||= []
+    @singleton_models[project][role] ||= {}
     models.each do |model|
       if model.class == Class
-        @singleton_models[project][role] << { model => [ :index, :show, :update, :create, :destroy ] }
+        @singleton_models[project][role].merge! model => [ :index, :show, :update, :create, :destroy ]
       elsif model.class == Hash
-        @singleton_models[project][role] << model
+        @singleton_models[project][role].merge! model
       end
     end
     @singleton_models = @singleton_models.with_indifferent_access
@@ -19,7 +19,7 @@ module Tramway::Admin::SingletonModels
     models = get_models_by_key(@singleton_models, project, role)
     if project_is_engine?(project)
       models += engine_class(project).dependencies.map do |dependency|
-        @singleton_models[dependency]
+        @singleton_models[dependency][role]&.keys
       end.flatten.compact
     end
     models

data/lib/tramway/admin/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Admin
-    VERSION = '1.24.0.3'
+    VERSION = '1.25'
   end
 end

metadata

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