tramway-core 1.18.3.5 → 1.18.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0551fcbf52c09db71a97c6198d33747af8ac7f4bb72e00e6e1b23f41810d9897
-  data.tar.gz: 25c38989f7a757b45906057cd0263c8300ba3183d87d47ee4f7d8e5b80fa8184
+  metadata.gz: cd7c92b51cc68200779758562f6b9e2e8749d996344d9b9b4b6352e18e18c468
+  data.tar.gz: 07a2755db29397428160c07ccec045c28b5f56bf9dbea3a73fc8c9ebd7655b2f
 SHA512:
-  metadata.gz: 7b51f713c0f7949d63da70c5b1a3c4db597d4b3e88b190c2907221ca08cbf929598c3bced628ed1385a0b936b75029ad47e2c6f1bbe784a5d2204231d5d46f44
-  data.tar.gz: e95f70c2ec16b8f76a81ef6c4e38597ca229e15870fea9fd6b5439c96b3f230ad6ecbada1527a7fa43b38caf2532bcf92f80489397c7871e9b451a018fd201da
+  metadata.gz: d934a4a8c7400a8733ce57c7a6001ba1f09d3ca3cf87656db86e8dfcaf16a7efe4f8309414dac496a11cc0a0887ebb1b97acb431aec68b4210ab889aa7ed79ee
+  data.tar.gz: 160d50747704912eba0a31035c3137fe9f48cbb5705d3823404bc97607adf31a8b8ff6c0abd100725b84fd9573811b14ef9d56b7c9a8a68495d7cd69c2955747

data/app/decorators/tramway/core/attributes/view_helper.rb

@@ -15,8 +15,10 @@ module Tramway::Core::Attributes::ViewHelper
   def view_by_value(object, value, attribute)
     if value.class.in? [ActiveSupport::TimeWithZone, DateTime, Time]
       datetime_view(attribute[1])
-    elsif value.class.superclass == ApplicationUploader
+    elsif value.class == PhotoUploader
       image_view(object.send(attribute[0]))
+    elsif value.class == FileUploader
+      file_view(object.send(attribute[0]))
     elsif value.is_a? Enumerize::Value
       enumerize_view(value)
     else

data/app/decorators/tramway/core/concerns/attributes_decorator_helper.rb

@@ -25,6 +25,17 @@ module Tramway::Core::Concerns::AttributesDecoratorHelper
     end
   end
 
+  def file_view(original, filename: nil)
+    return unless original.present?
+
+    filename ||= build_filename(original)
+    content_tag(:div) do
+      concat filename
+      concat ' '
+      concat download_button(filename: filename, original: original) if filename
+    end
+  end
+
   def enumerize_view(value)
     value.text
   end
@@ -65,6 +76,10 @@ module Tramway::Core::Concerns::AttributesDecoratorHelper
         message: e.message, attribute_name: attribute_name
       )
     end
-    concat link_to(fa_icon(:download), src_original(original), class: 'btn btn-success', download: filename) if filename
+    concat download_button(filename: filename, original: original) if filename
+  end
+
+  def download_button(filename:, original:)
+    link_to(fa_icon(:download), src_original(original), class: 'btn btn-success', download: filename)
   end
 end

data/lib/tramway/core/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Core
-    VERSION = '1.18.3.5'
+    VERSION = '1.18.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 1.18.3.5
+  version: 1.18.4
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-26 00:00:00.000000000 Z
+date: 2020-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audited