cm-admin 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28ba47b6a7c02c8edad75f7407f3c6c65cb2f59b44aea6952c7abbc174595ecc
-  data.tar.gz: 7216647324f0791c1090ae0f0fd9f252b2c1d53939553dfb4c9c390d99dc68b3
+  metadata.gz: fef403882161b778959795eb4ee4b340a471913582710ed998d3d0c3c6d809eb
+  data.tar.gz: 4f083b865564092997f8a959c22b05675c07bd2973f959a357cf0ee132295fcc
 SHA512:
-  metadata.gz: f2f58b8468437f6785010ba74c00210332eabc56de6167503c91ca9df6c07a3ef6709f8b943f2de156aeea897564e17564aa19e70638ca08d28fb1fe212803c3
-  data.tar.gz: 1847f6e693831247dee15f416e537c39f1a6f3725e934774dbed4f76bf879ebfba16fd69324280594232638ce559092fb09b45bf4d22442a2e1ffb608b87bf02
+  metadata.gz: 444abf2ad421b1db1bdba4b506a7645e1d5e1653b78c6610c434f45999acc0b7b7ae11017df43f82f37058ec1cdff0aeb5b2a0a3ea0dc08e25c22b713d1cf6c0
+  data.tar.gz: b3475419d75358580b07914f988183071b95ad7a2f891811a8dce9a89aa2b1d90237a0b7b8340619142f90ab62de50e3b50f0ffa626a948a09f306c12601acc5

data/Gemfile.lock

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

data/app/controllers/cm_admin/resource_controller.rb

@@ -178,13 +178,16 @@ module CmAdmin
 
     def filter_by(params, records, filter_params={}, sort_params={})
       filtered_result = OpenStruct.new
-      sort_column = "created_at"
-      sort_direction = %w[asc desc].include?(sort_params[:sort_direction]) ? sort_params[:sort_direction] : "asc"
-      sort_params = {sort_column: sort_column, sort_direction: sort_direction}
-
+      cm_model = @associated_model || @model
+      db_columns = cm_model.ar_model&.columns&.map{|x| x.name.to_sym}
+      if db_columns.include?(@current_action.sort_column)
+        sort_column = @current_action.sort_column
+      else
+        sort_column = 'created_at'
+      end
       records = "CmAdmin::#{@model.name}Policy::Scope".constantize.new(Current.user, @model.name.constantize).resolve if records.nil?
-      records = records.order("#{@current_action.sort_column} #{@current_action.sort_direction}")
-      final_data = CmAdmin::Models::Filter.filtered_data(filter_params, records, @associated_model ? @associated_model.filters : @model.filters)
+      records = records.order("#{sort_column} #{@current_action.sort_direction}")
+      final_data = CmAdmin::Models::Filter.filtered_data(filter_params, records, cm_model.filters)
       pagy, records = pagy(final_data)
       filtered_result.data = records
       filtered_result.pagy = pagy

data/lib/cm_admin/configuration.rb

@@ -1,12 +1,11 @@
 module CmAdmin
   class Configuration
-    attr_accessor :layout, :included_models, :cm_admin_models, :authorized_roles
-
+    attr_accessor :layout, :included_models, :cm_admin_models
+    
     def initialize
       @layout = 'admin'
       @included_models = []
       @cm_admin_models = []
-      @authorized_roles = []
     end
 
   end

data/lib/cm_admin/models/dsl_method.rb

@@ -140,14 +140,6 @@ module CmAdmin
       end
 
       def sort_column(column = :created_at)
-        model = if @current_action.child_records
-          CmAdmin::Model.find_by(name: @current_action.child_records.to_s.classify)
-        else
-          self
-        end
-        db_columns = model.instance_variable_get(:@ar_model)&.columns&.map{|x| x.name.to_sym}
-        raise "Sorting for custom column #{column} does not exist." unless db_columns.include?(column.to_sym)
-
         @current_action.sort_column = column.to_sym if @current_action
       end
     end

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '1.0.0'
+  VERSION = '1.0.2'
 end

data/lib/cm_admin/view_helpers/form_field_helper.rb

@@ -128,11 +128,10 @@ module CmAdmin
         else
           form_obj.check_box cm_field.field_name,
                              {
-                               class: "normal-input cm-checkbox #{required_class}",
+                               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_type: 'linked-field',
+                                 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") : ''
                                }
@@ -163,8 +162,6 @@ module CmAdmin
                                       disabled: cm_field.disabled,
                                       name: "#{@model.name.underscore}[#{cm_field.field_name}][]",
                                       data: {
-                                        field_name: cm_field.field_name,
-                                        field_type: 'linked-field',
                                         target_action: target_action&.name,
                                         target_url: target_action&.name ? cm_admin.send("#{@model.name.underscore}_#{target_action&.name}_path", ':param_1') : ''
                                       }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-07 00:00:00.000000000 Z
+date: 2023-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails