cm-admin 1.5.29 → 1.5.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8633d5b2705caba1ed7329b20ac6bfad6e4ef045ded72027768fc615eca2aefe
-  data.tar.gz: 6c825574261c4552a5c94e9c9a3260267717c6521a974202abc832f1b3c893ef
+  metadata.gz: e7b3d959b5e4c28d831b165dc391c42953beb42f87a9c078c97bb42f3dec2a64
+  data.tar.gz: a08df5bdd7d91feee259f8f18e1a198fdb3022192c4684e121cfccd2f36b1a6e
 SHA512:
-  metadata.gz: db5ace7e6cb92376805d4d51cc6ce3cf15228b3756efaa2983e74be73b4d2a8861c30559adb58be2bc0d95c4208d920e4433386b4d604ec7149335f820bd0abd
-  data.tar.gz: 8767d826ba1d1d3b5f9950c5dfcbc4582a7a730b234c04c2aef5f956ca52807c0498373d1ffca23e9afc7a7175cae28249e93946cbc98e7c7772c4aa948fc6c8
+  metadata.gz: 98265ae7f832c8d132853a45f0c7263398530a43b485151695d6a7b8350da8221f0e584938dfd154367f815dad55071b922cdb826649be140f79aa14169765e8
+  data.tar.gz: e9ef61ff233874c87a88a2d3a8ea677d9c7ace389e9375dc2beb688cdc95db3ba9acfce27c24350bcabd8aa5f10474e8fb62c68c51d125ba914919baa683874b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cm-admin (1.5.29)
+    cm-admin (1.5.30)
       caxlsx_rails
       cocoon (~> 1.2.15)
       csv-importer (~> 0.8.2)

data/app/controllers/cm_admin/resource_controller.rb

@@ -39,7 +39,7 @@ module CmAdmin
         else
           format.html { render '/cm_admin/main/' + action_name }
         end
-        format.json { render json: @ar_object }
+        format.json { render json: @ar_object.to_builder.target! }
       end
     end
 

data/app/views/cm_admin/main/_nested_table_form.html.slim

@@ -12,7 +12,7 @@
               | 
             - nested_table_field.fields.each do |field|
               th data-field-type="#{field.input_type}"
-                = field.field_name.to_s.titleize 
+                = field.label.to_s.titleize || field.field_name.to_s.titleize 
         tbody class="insert-cocoon-position-#{uniq_no}"
           = f.fields_for table_name do |record|
             - if record.object.persisted? || @ar_object.errors.present?

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '1.5.29'
+  VERSION = '1.5.30'
 end

data/lib/cm_admin/view_helpers/field_display_helper.rb

@@ -98,17 +98,14 @@ module CmAdmin
             concat content_tag(:div, 'View', class: 'drawer-btn')
           end
         when :image
+          attachment = ar_object.send(field.field_name)
           content_tag(:div, class: 'd-flex') do
-            if ar_object.send(field.field_name).attached?
+            if attachment.attached?
               if has_one_image_attached?(ar_object, field)
-                content_tag :a, href: rails_blob_path(ar_object.send(field.field_name)), target: '_blank' do
-                  image_tag(ar_object.send(field.field_name).url, height: field.height, width: field.width, class: 'rounded')
-                end
+                attachment_with_preview(attachment, field)
               elsif has_many_image_attached?(ar_object, field)
-                ar_object.send(field.field_name).map do |asset|
-                  content_tag :a, href: rails_blob_path(asset), target: '_blank' do
-                    image_tag(asset.url, height: field.height, width: field.width, class: 'rounded mr-1')
-                  end
+                attachment.map do |asset|
+                  attachment_with_preview(asset, field, 'mr-1')
                 end.join("\n").html_safe
               end
             else
@@ -126,16 +123,26 @@ module CmAdmin
         end
       end
 
+      def attachment_with_preview(attachment, field, custom_class = nil)
+        content_tag :a, href: attachment.url, target: '_blank' do
+          if attachment.content_type.include?('image')
+            image_tag(attachment.url, height: field.height, width: field.width, class: "rounded #{custom_class}")
+          else
+            image_tag('https://cm-admin.s3.ap-south-1.amazonaws.com/gem_static_assets/image_not_available.png', height: 50, width: 50, class: "rounded #{custom_class}")
+          end
+        end
+      end
+
       def show_attachment_value(ar_object, field)
         if ar_object.send(field.field_name).attached?
           if has_one_image_attached?(ar_object, field)
-            content_tag :a, href: rails_blob_path(ar_object.send(field.field_name), disposition: "attachment") do
+            content_tag :a, href: ar_object.send(field.field_name).url do
               ar_object.send(field.field_name).filename.to_s
             end
           elsif has_many_image_attached?(ar_object, field)
             ar_object.send(field.field_name).map do |asset|
               content_tag(:div) do
-                content_tag :a, href: rails_blob_path(asset, disposition: "attachment") do
+                content_tag :a, href: asset.url do
                   asset.filename.to_s
                 end
               end

data/lib/cm_admin/view_helpers/form_field_helper.rb

@@ -51,7 +51,7 @@ module CmAdmin
                             }, cm_field.html_attrs )
       end
 
-      def cm_custom_string_field(form_obj, cm_field, value, required_class, _target_action)
+      def cm_custom_string_field(form_obj, cm_field, value, required_class, _target_action_ajax_url)
         text_field_tag cm_field.html_attrs[:name] || cm_field.field_name,
                             merge_wrapper_options(
                             {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 1.5.29
+  version: 1.5.30
 platform: ruby
 authors:
 - sajinmp