tramway-admin 1.23.0.3 → 1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e829ed2d89e8d5fd1473c6e9ee5b62e0575f5c75d60a7093847c6528c7dfa380
-  data.tar.gz: 0641cb8bb91d91f751d0aba568d0c31915ecf4832474889b0d791680bb4f9af4
+  metadata.gz: 011d456ac295086199431405fbb6d3531094e79c985918fa968a789ca1f02bed
+  data.tar.gz: 0a9d46e59b30f6b4fee4d83adcf1d69bffe184ec965931cbb3e318a5111b0fc0
 SHA512:
-  metadata.gz: ee3bfebb363dcbad9d0beee9ff640d7dbecec7c6894bd462c084cf5c5e2b3505cd54c6dc56481d33855b50889abded2274471a94ab1c04daf0a156a52eba6896
-  data.tar.gz: 6ff5398fd1251c97811667d05075d317f35ef668ed63a04a968c11c230ae7599957d17ba6213fcf81b1c6c975eb8efbcbb44b012317aead899418c5647ac79d5
+  metadata.gz: 0c11ce53229c6bb4e73d482a575d65e268d02b93cfff84545cb5385c7e4289c54e0607b01e5c77c2fe683235babd5fe134d6487c5213594d8c31765c299c7823
+  data.tar.gz: 6cf766da4f7d49f79908a097a155435e6646651599fa4d5c0df8e450a4ff33425cdc57a7e4a4cee4a519c2a8f0a588ea4364c522c635e4c2055be1f30879497a

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

@@ -13,5 +13,6 @@
             %td
               = link_to association_object.name, record_path(association_object.id, model: association.options[:class_name])
             %td
-              = 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
-                = fa_icon 'trash-alt'
+              - 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
+                  = fa_icon 'trash-alt'

data/lib/tramway/admin.rb

@@ -39,8 +39,24 @@ module Tramway
         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]
+      def action_is_available?(record, project:, role:, model:, action:)
+        actions = select_actions(project: project, role: role, model: model)
+        availability = actions&.select do |a|
+          if a.is_a? Symbol
+            a == action.to_sym
+          elsif a.is_a? Hash
+            a.keys.first.to_sym == action.to_sym
+          end
+        end.first
+
+        return false unless availability.present?
+        return true if availability.is_a? Symbol
+
+        return availability.values.first.call record
+      end
+
+      def select_actions(project:, role:, model:)
+        @singleton_models&.dig(project, role, model) || @available_models&.dig(project, role, model)
       end
     end
   end

data/lib/tramway/admin/records_models.rb

@@ -6,10 +6,9 @@ module Tramway::Admin::RecordsModels
     @available_models[project] ||= {}
     @available_models[project][role] ||= {}
     models.each do |model|
-      case model.class
-      when Class
+      if model.class == Class
         @available_models[project][role].merge! model => [ :index, :show, :update, :create, :destroy ]
-      when Hash
+      elsif model.class == Hash
         @available_models[project][role].merge! model
       end
     end

data/lib/tramway/admin/singleton_models.rb

@@ -6,11 +6,10 @@ module Tramway::Admin::SingletonModels
     @singleton_models[project] ||= {}
     @singleton_models[project][role] ||= []
     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
+      if model.class == Class
+        @singleton_models[project][role] << { model => [ :index, :show, :update, :create, :destroy ] }
+      elsif model.class == Hash
+        @singleton_models[project][role] << model
       end
     end
     @singleton_models = @singleton_models.with_indifferent_access

data/lib/tramway/admin/version.rb

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

metadata

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