tramway-core 1.18.3.4 → 1.18.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3022ae1f46a09e9189dc9a8631dd1df188743e2ad6a9b735bc54666128eab453
-  data.tar.gz: 13e4ff6a1f40ca6a664f86d83c4b9c73f90dec9016e75350de617582a59ed222
+  metadata.gz: 28bca828825ed63cfecc857febadda0ba9cc44b43b851009982de2dec760c3ab
+  data.tar.gz: 1c4cb7d7dd804f538b3c0acb4e3c54d2dd42799583fc89c76467ee17c7f68d9a
 SHA512:
-  metadata.gz: 1e9c683e1f7d7f335518d8392a6fe08695902efc3b0bb44586a76e44708c234697848712197a2eeeb7bdbd3e4aebb669e735456e40bb9d7579aac55afe3c952d
-  data.tar.gz: 1029ffafaae5f43dc75ce08b9f982a16914d2b0e3072311513aa3f10ef443612eb33a7a1e6fca0bb14bb31dc5d0f6d81caab9f78144aa18d97b564aaa6bcce57
+  metadata.gz: bf9ed7162852e76ff1bb5f67a144719da05ba2643a604bb753a3d361863f4ea573e553e9f1ae27f5b7c8be9846940552a26c1e3035d556f345b592f2afc2b346
+  data.tar.gz: b7533a50cd1e1803c05af20ba9433b72bf551b31faf1da0f6eed59300b821f73472af8f3862915f9cce48601412f3d8e2da6c4245eb8e41bcecd33f8a704a65c

data/README.md

@@ -1,4 +1,4 @@
-# Tramway::Core
+# Tramway::Core ![Ruby](https://github.com/Purple-Magic/tramway-core/workflows/Tests/badge.svg) ![Ruby](https://github.com/Purple-Magic/tramway-core/workflows/Rubocop/badge.svg) [![Gem Version](https://badge.fury.io/rb/tramway-core.svg)](https://badge.fury.io/rb/tramway-core)
 
 *If you need translation of this Readme, please message us kalashnikov@ulmic.ru. We'll translate for you and post to this page*
 

data/app/assets/javascripts/tramway/core/application.js

@@ -1,6 +1,8 @@
+// require popper FIXME should be optional requiring
 //= require jquery
 //= require jquery_ujs
 //= require jquery3
+//= require popper
 // require popper FIXME should be optional requiring
 //= require bootstrap
 //= require bootstrap-datepicker-1.8.0

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/app/forms/tramway/core/application_form.rb

@@ -61,12 +61,16 @@ class Tramway::Core::ApplicationForm
         options = @@model_class.reflect_on_all_associations(:belongs_to).select do |a|
           a.name == association.to_sym
         end.first&.options
+        add_polymorphic_association hash, association, options
+      end
+    end
 
-        if options&.dig(:polymorphic)
-          hash.merge! association => @@model_class.send("#{association}_type").values
-        elsif options
-          hash.merge!(association => (options[:class_name] || association.to_s.camelize).constantize)
-        end
+    def add_polymorphic_association(hash, association, options)
+      if options&.dig(:polymorphic)
+        hash.merge association => @@model_class.send("#{association}_type").values
+      elsif options
+        hash.merge(association => (options[:class_name] || association.to_s.camelize).constantize)
+      else
         hash
       end
     end

data/app/models/tramway/core/application_record.rb

@@ -25,7 +25,8 @@ class Tramway::Core::ApplicationRecord < ActiveRecord::Base
   include ::PgSearch::Model
 
   def creator
-    audits.where(action: :create).first.user
+    creation_event = audits.where(action: :create).first
+    creation_event.user if creation_event.user_id.present?
   end
 
   # FIXME: detect inhertited locales

data/lib/tramway/core/generators.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-module Tramway::Core
-  module Generators
+module Tramway
+  module Core
+    module Generators
+    end
   end
 end

data/lib/tramway/core/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Core
-    VERSION = '1.18.3.4'
+    VERSION = '1.18.5.2'
   end
 end

metadata

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