cm-admin 0.8.1 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d4d1a58010d3994e7df3ef12930bcbd41d28a6e5a5fe12803dbe0b129272ba3
-  data.tar.gz: 97a80e2e67fbe2a67702b755f1772b0218ff892ca0bfd1d43655f561020b3665
+  metadata.gz: 46493821058fb3837c097bc0a0aa491c8a45ba858c20e079bd2f546f94bd6ef7
+  data.tar.gz: d711c110547d83c120f3d0750f3d6e49db925ab622baf2051686f51927c55203
 SHA512:
-  metadata.gz: d8a20aeb76b4533e1134adbaa126c034ed8fc3f5b8366a1191b031363e109b5dae719a8414ee92eb316440aa605ceb780da126b319c9fb163b5999fe94bf396c
-  data.tar.gz: f857581be503ef9e20ae8512b869923db95322256c2586584fa65a2058148e00abd14c291dc8fda6a28fabfb8fb74f3fdc7fa66cdef23bab020ad101b03df222
+  metadata.gz: ae3d4e6c410bf6197b2f932309a60c8f440a7b3f91de3d9f719a65debcda95e09ffe0b101e6ee7bd01dabda916ffeecb21cdbc2bd8b6f17ee17ceba6fe6022d6
+  data.tar.gz: afc522a55a080d8487b761875a407c286a109c84692a177f211f7abc1436ace836440742f544a8ac029d115494b831e903f71bb13fbd814af9be2dcd652153bb

data/Gemfile.lock

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

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

@@ -26,7 +26,7 @@
           - @model.available_fields[:index].each_with_index do |column, index|
             td.text-ellipsis
               span class="#{column.field_type.to_s} #{column.cm_css_class} "
-                - if index == 0
+                - if index == 0 && !([:link, :custom, :attachment, :drawer, :image].include?(column.field_type))
                   = link_to ar_object.send(column.field_name), cm_admin.send("#{ar_object.model_name.singular}_show_path", ar_object.id)
                 - else
                   = show_field_value(ar_object, column)

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

@@ -9,19 +9,20 @@
       p.title-sub-text = action_description
   .cm-navbar__rhs
     - if @model.current_action.name == 'index'
-      .export-container
-        .dropdown
-          button.secondary-btn data-bs-toggle='dropdown'
-            span
-              i.fa.fa-arrow-down
-            span
-              | Export
-            span
-              i.fa.fa-angle-down
-          ul.dropdown-menu.export-popup
-            li
-              .popup-option.pointer data-bs-toggle='modal' data-bs-target='#exportmodal'
-                span Export
+      - if has_valid_policy(@model.name, :exportable)
+        .export-container
+          .dropdown
+            button.secondary-btn data-bs-toggle='dropdown'
+              span
+                i.fa.fa-arrow-down
+              span
+                | Export
+              span
+                i.fa.fa-angle-down
+            ul.dropdown-menu.export-popup
+              li
+                .popup-option.pointer data-bs-toggle='modal' data-bs-target='#exportmodal'
+                  span Export
       - if @model.importer
         = link_to 'Import', cm_admin.send(:"#{@model.name.underscore}_import_path"), class: 'primary-btn ml-2'
       - new_action = @model.available_actions.select{|act| act if act.action_type.eql?(:default) && act.name.eql?('new')}

data/lib/cm_admin/models/form_field.rb

@@ -1,7 +1,7 @@
 module CmAdmin
   module Models
     class FormField
-      attr_accessor :field_name, :label, :header, :input_type, :collection, :disabled, :helper_method
+      attr_accessor :field_name, :label, :header, :input_type, :collection, :disabled, :helper_method, :placeholder
       VALID_INPUT_TYPES = [:integer, :decimal, :string, :single_select, :multi_select, :date, :date_time, :text, :single_file_upload, :multi_file_upload, :hidden, :rich_text].freeze
 
       def initialize(field_name, input_type, attributes = {})
@@ -17,6 +17,7 @@ module CmAdmin
         self.disabled = false
         self.label = self.field_name.to_s.titleize
         self.input_type = :string
+        self.placeholder = "Enter #{self.field_name.to_s.downcase.gsub('_', ' ')}"
       end
     end
   end

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = "0.8.1"
+  VERSION = "0.8.3"
 end

data/lib/cm_admin/view_helpers/field_display_helper.rb

@@ -66,7 +66,7 @@ module CmAdmin
             if ar_object.send(field.field_name).attached?
               image_tag(ar_object.send(field.field_name).url, height: field.height, width: field.height)
             else
-              image_tag('/assets/image_not_available', height: 50, width: 50)
+              image_tag('https://cm-admin.s3.ap-south-1.amazonaws.com/gem_static_assets/image_not_available.png', height: 50, width: 50)
             end
           end
         end

data/lib/cm_admin/view_helpers/form_field_helper.rb

@@ -13,7 +13,7 @@ module CmAdmin
         when :string
           return f.text_field field.field_name, class: "normal-input #{required_class}", disabled: field.disabled, value: value, placeholder: "Enter #{field.field_name.to_s.downcase.gsub('_', ' ')}"
         when :single_select
-          return f.select field.field_name, options_for_select(select_collection_value(field), f.object.send(field.field_name)), {include_blank: "Select #{field.field_name.to_s.downcase.gsub('_', ' ')}"}, class: "normal-input #{required_class} select-2", disabled: field.disabled
+          return f.select field.field_name, options_for_select(select_collection_value(field), f.object.send(field.field_name)), {include_blank: field.placeholder.to_s}, class: "normal-input #{required_class} select-2", disabled: field.disabled
         when :multi_select
           return f.select field.field_name, options_for_select(select_collection_value(field), f.object.send(field.field_name)), {include_blank: "Select #{field.field_name.to_s.downcase.gsub('_', ' ')}"}, class: "normal-input #{required_class} select-2", disabled: field.disabled, multiple: true
         when :date

data/lib/cm_admin.rb

@@ -35,8 +35,7 @@ module CmAdmin
     def initialize_model(entity, &block)
       if entity.is_a?(Class)
         return if CmAdmin::Model.find_by({name: entity.name})
-        cm_model = CmAdmin::Model.new(entity, &block)
-        config.cm_admin_models << cm_model
+        config.cm_admin_models << CmAdmin::Model.new(entity, &block)
       end
     end
   end

data/tmp/cache/webpacker/last-compilation-digest-development

@@ -1 +1 @@
-31533361827c4faa12bf892403c629479a81246a
+41eaf97f2fb017cf52d8df48e6d8d6d35f997b2e

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.3
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-12 00:00:00.000000000 Z
+date: 2022-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails