cm-admin 1.1.7 → 1.1.9

data/lib/cm_admin/view_helpers/form_field_helper.rb

@@ -7,7 +7,7 @@ module CmAdmin
         value = cm_field.helper_method ? send(cm_field.helper_method, form_obj.object, cm_field.field_name) : form_obj.object.send(cm_field.field_name)
         is_required = form_obj.object._validators[cm_field.field_name].map(&:kind).include?(:presence)
         required_class = is_required ? 'required' : ''
-        target_action = @model.available_actions.select{|x| x.name == cm_field.target[:action_name].to_s}.first if cm_field.target.present?
+        target_action = @model.available_actions.select { |x| x.name == cm_field.target[:action_name].to_s }.first if cm_field.target.present?
         send("cm_#{cm_field.input_type}_field", form_obj, cm_field, value, required_class, target_action)
       end
 
@@ -16,7 +16,7 @@ module CmAdmin
                             class: "normal-input #{required_class}",
                             disabled: cm_field.disabled,
                             value: value,
-                            placeholder: "Enter #{cm_field.field_name.to_s.humanize.downcase}",
+                            placeholder: cm_field.placeholder,
                             data: { behaviour: 'integer-only' }
       end
 
@@ -25,7 +25,7 @@ module CmAdmin
                               class: "normal-input #{required_class}",
                               disabled: cm_field.disabled,
                               value: value,
-                              placeholder: "Enter #{cm_field.field_name.to_s.downcase.gsub('_', ' ')}",
+                              placeholder: cm_field.placeholder,
                               data: { behaviour: 'decimal-only' }
       end
 
@@ -34,12 +34,12 @@ module CmAdmin
                             class: "normal-input #{required_class}",
                             disabled: cm_field.disabled,
                             value: value,
-                            placeholder: "Enter #{cm_field.field_name.to_s.downcase.gsub('_', ' ')}"
+                            placeholder: cm_field.placeholder
       end
 
       def cm_single_select_field(form_obj, cm_field, value, required_class, target_action)
         form_obj.select cm_field.field_name, options_for_select(select_collection_value(form_obj.object, cm_field), form_obj.object.send(cm_field.field_name)),
-                        { include_blank: cm_field.placeholder.to_s.presence || "Select #{cm_field.field_name.to_s.humanize(capitalize: false)}}" },
+                        { include_blank: cm_field.placeholder },
                         class: "normal-input #{required_class} select-2",
                         disabled: cm_field.disabled,
                         data: {
@@ -53,7 +53,7 @@ module CmAdmin
       def cm_multi_select_field(form_obj, cm_field, value, required_class, target_action)
         form_obj.select cm_field.field_name,
                         options_for_select(select_collection_value(form_obj.object, cm_field), form_obj.object.send(cm_field.field_name)),
-                        { include_blank: cm_field.placeholder.to_s.presence || "Select #{cm_field.field_name.to_s.humanize(capitalize: false)}" },
+                        { include_blank: cm_field.placeholder },
                         class: "normal-input #{required_class} select-2",
                         disabled: cm_field.disabled, multiple: true
       end
@@ -63,7 +63,7 @@ module CmAdmin
                             class: "normal-input #{required_class}",
                             disabled: cm_field.disabled,
                             value: value&.strftime('%d-%m-%Y'),
-                            placeholder: "Enter #{cm_field.field_name.to_s.downcase.gsub('_', ' ')}",
+                            placeholder: cm_field.placeholder,
                             data: { behaviour: 'date-only' }
       end
 
@@ -72,20 +72,20 @@ module CmAdmin
                             class: "normal-input #{required_class}",
                             disabled: cm_field.disabled,
                             value: value,
-                            placeholder: "Enter #{cm_field.field_name.to_s.downcase.gsub('_', ' ')}",
+                            placeholder: cm_field.placeholder,
                             data: { behaviour: 'date-time' }
       end
 
       def cm_text_field(form_obj, cm_field, value, required_class, _target_action)
         form_obj.text_area cm_field.field_name,
                            class: "normal-input #{required_class}",
-                           placeholder: "Enter #{cm_field.field_name.to_s.downcase.gsub('_', ' ')}"
+                           placeholder: cm_field.placeholder
       end
 
       def cm_rich_text_field(form_obj, cm_field, value, required_class, _target_action)
         form_obj.rich_text_area cm_field.field_name,
                                 class: "normal-input #{required_class}",
-                                placeholder: "Enter #{cm_field.field_name.to_s.downcase.gsub('_', ' ')}"
+                                placeholder: cm_field.placeholder
       end
 
       def cm_single_file_upload_field(form_obj, cm_field, _value, required_class, _target_action)
@@ -114,16 +114,16 @@ module CmAdmin
       # helper_method argument will accept a method where value can be passed.
       def select_collection_value(object, cm_field)
         if cm_field.helper_method
-          collection = send(cm_field.helper_method, object, cm_field.field_name)
+          send(cm_field.helper_method, object, cm_field.field_name)
         elsif cm_field.collection
-          collection = cm_field.collection
+          cm_field.collection
         else
-          collection = []
+          []
         end
       end
 
       def format_check_box_options(value, form_obj, cm_field, required_class, target_action)
-        if value.class == Array
+        if value.instance_of?(Array)
           format_check_box_array(value, form_obj, cm_field, required_class, target_action)
         else
           form_obj.check_box cm_field.field_name,
@@ -131,7 +131,7 @@ module CmAdmin
                                class: "normal-input cm-checkbox #{required_class} #{target_action.present? ? 'linked-field-request' : ''}",
                                disabled: cm_field.disabled,
                                data: {
-                                 field_name: cm_field.field_name, 
+                                 field_name: cm_field.field_name,
                                  target_action: target_action&.name,
                                  target_url: target_action&.name ? cm_admin.send("#{@model.name.underscore}_#{target_action&.name}_path") : ''
                                }
@@ -169,7 +169,6 @@ module CmAdmin
         end
       end
 
-
       def format_radio_button_options(options, form_obj)
         content_tag :div do
           options.each do |val, key|
@@ -177,7 +176,7 @@ module CmAdmin
           end
         end
       end
-  
+
       def format_radio_option(val, key, form_obj)
         content_tag :div, class: 'cm-radio-section' do
           concat format_radio_button(val, form_obj)

data/lib/cm_admin/view_helpers/form_helper.rb

@@ -94,7 +94,8 @@ module CmAdmin
           end
           concat split_form_into_section(resource, form_obj, sections_array)
           concat tag.br
-          concat form_obj.submit 'Save', class: 'cta-btn mt-3 form_submit', data: {form_class: "cm_#{form_obj.object.class.name.downcase}_form"}
+           # TODO: form_submit class is used for JS functionality, Have to remove 
+          concat form_obj.submit 'Save', class: 'btn-cta mt-3 form_submit', data: {form_class: "cm_#{form_obj.object.class.name.downcase}_form"}
         end
       end
     end

data/lib/cm_admin/view_helpers/manage_column_popup_helper.rb

@@ -65,8 +65,8 @@ module CmAdmin
 
       def manage_column_footer
         concat(content_tag(:div, class: 'modal-footer') do
-          concat tag.button 'Close', class: 'gray-border-btn', data: {bs_dismiss: 'modal'}
-          concat tag.button 'Save', class: 'cta-btn'
+          concat tag.button 'Close', class: 'btn-secondary', data: {bs_dismiss: 'modal'}
+          concat tag.button 'Save', class: 'btn-cta'
         end)
         return
       end

data/lib/cm_admin/view_helpers/page_info_helper.rb

@@ -67,7 +67,7 @@ module CmAdmin
             when :modal
               custom_modal_button(custom_action)
             when :page
-              link_to custom_action_title(custom_action), "#{@model.ar_model.table_name}/#{custom_action.path}", class: 'secondary-btn ml-2', method: custom_action.verb
+              link_to custom_action_title(custom_action), "#{@model.ar_model.table_name}/#{custom_action.path}", class: 'btn-secondary ml-2', method: custom_action.verb
             end
           end
         end
@@ -83,14 +83,14 @@ module CmAdmin
 
       def custom_action_button(custom_action, current_action_name)
         if current_action_name == "index"
-          button_to custom_action_title(custom_action), @model.ar_model.table_name + '/' + custom_action.path, class: 'secondary-btn ml-2', method: custom_action.verb
+          button_to custom_action_title(custom_action), @model.ar_model.table_name + '/' + custom_action.path, class: 'btn-secondary ml-2', method: custom_action.verb
         elsif current_action_name == "show"
-          button_to custom_action_title(custom_action), custom_action.path.gsub(':id', params[:id]), class: 'secondary-btn ml-2', method: custom_action.verb
+          button_to custom_action_title(custom_action), custom_action.path.gsub(':id', params[:id]), class: 'btn-secondary ml-2', method: custom_action.verb
         end
       end
 
       def custom_modal_button(custom_action)
-        link_to custom_action_title(custom_action), '', class: 'secondary-btn ml-2', data: { bs_toggle: "modal", bs_target: "##{custom_action.name.classify}Modal" }
+        link_to custom_action_title(custom_action), '', class: 'btn-secondary ml-2', data: { bs_toggle: "modal", bs_target: "##{custom_action.name.classify}Modal" }
       end
 
       def custom_action_title(custom_action)

data/lib/cm_admin/view_helpers.rb

@@ -53,7 +53,8 @@ module CmAdmin
           concat hidden_field_tag 'class_name', klass.name.to_s, id: 'export-to-file-klass'
           concat checkbox_row(klass)
           concat tag.hr
-          concat submit_tag 'Export', class: 'btn btn-primary btn-bordered export-to-file-btn'
+          # TODO: export-to-file-btn class is used for JS functionality, Have to remove 
+          concat submit_tag 'Export', class: 'btn-primary export-to-file-btn' 
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.9
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-04 00:00:00.000000000 Z
+date: 2023-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -172,6 +172,7 @@ files:
 - ".rubocop.yml"
 - ".stylelintrc.json"
 - ".travis.yml"
+- ".vscode/settings.json"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -224,6 +225,7 @@ files:
 - app/assets/stylesheets/cm_admin/dependency/bootstrap.min.css
 - app/assets/stylesheets/cm_admin/dependency/flatpickr.min.css
 - app/assets/stylesheets/cm_admin/dependency/fontawesome.all.css
+- app/assets/stylesheets/cm_admin/dependency/jquery-jgrowl.min.css
 - app/assets/stylesheets/cm_admin/helpers/_mixins.scss
 - app/assets/stylesheets/cm_admin/helpers/_variable.scss
 - app/assets/stylesheets/cm_admin/helpers/index.scss
@@ -310,6 +312,7 @@ files:
 - lib/cm_admin/models/section.rb
 - lib/cm_admin/models/tab.rb
 - lib/cm_admin/models/utils/associations.rb
+- lib/cm_admin/models/utils/helpers.rb
 - lib/cm_admin/utils.rb
 - lib/cm_admin/version.rb
 - lib/cm_admin/version_manager.rb