effective_datatables 4.39.0 → 4.39.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fe405963ee6a36df90da14af7cfdff5b60165c039ff9e751a4165b7eb220ab1
-  data.tar.gz: 3607ded1b1a473b6e8e677b6682f64008f78d5fa8c62309d5e41ce0ffb8f3b55
+  metadata.gz: 12e01bd82fc2bf197109050265f20948617f7b0e57fac56c9d83cdf0469fd080
+  data.tar.gz: 043e49461b97e3d496b5556e4c14da0ce72249a6b03108bf66482c003f0e5d54
 SHA512:
-  metadata.gz: a7f3a25ced743083d05b20082fa3aa70c190724008d8dfda17769ffc32b50918f403860c299921f6693d07a63c64c4904ebf77174ec2ea6ee7982e20b8c70fde
-  data.tar.gz: 9cc2261a17cb6afa6eb5880489cae2dce99be7c88317b437d8219101b7502f4bdd47c6b71268185f8aef5500aacf20b81be092e9183013cdb6887d0bed7e6194
+  metadata.gz: 7a8c9b8745fcb7a477bff5ab7bc9699303a28edd8d616845f852fe949205c910b6e6e2bc453f7bd6e76105488b9e35cebbf9c42de7d4ca506eaf62777501b2a9
+  data.tar.gz: 77cc02b1405a176616ab8780e1afc21ad14f54244ccaadf4aa6575178b73c3bab28e51c4b506ffa1a6f1cf1f9a8263c2cfd2bfec823df352078c8a2c98ad2524

data/app/controllers/effective/datatables_controller.rb

@@ -67,18 +67,19 @@ module Effective
         EffectiveDatatables.authorize!(self, :update, @resource)
 
         attribute = @datatable.columns[:_reorder][:reorder]
+        column = @resource.class.arel_table[attribute]
         old_index = params[:reorder][:old].to_i
         new_index = params[:reorder][:new].to_i
 
         @resource.class.transaction do
           if new_index > old_index
-            @datatable.collection.where("#{attribute} > ? AND #{attribute} <= ?", old_index, new_index).update_all("#{attribute} = #{attribute} - 1")
+            @datatable.collection.where(column.gt(old_index).and(column.lteq(new_index))).update_all(attribute => column - 1)
             @resource.update_column(attribute, new_index)
             @resource.touch
           end
 
           if old_index > new_index
-            @datatable.collection.where("#{attribute} >= ? AND #{attribute} < ?", new_index, old_index).update_all("#{attribute} = #{attribute} + 1")
+            @datatable.collection.where(column.gteq(new_index).and(column.lt(old_index))).update_all(attribute => column + 1)
             @resource.update_column(attribute, new_index)
             @resource.touch
           end
@@ -88,7 +89,7 @@ module Effective
       rescue Effective::AccessDenied => e
         render(status: :unauthorized, body: 'Access Denied')
       rescue Exception => e
-        render(status: :error, body: 'Unexpected Error')
+        render(status: :internal_server_error, body: 'Unexpected Error')
       end
 
     end

data/app/models/effective/datatable_column_tool.rb

@@ -44,8 +44,12 @@ module Effective
     def order_column(collection, direction, column, sql_column)
       Rails.logger.info "COLUMN TOOL: order_column #{column.to_s} #{direction} #{sql_column}" if EffectiveDatatables.debug
 
-      if column[:sql_as_column]
-        collection.order(Arel.sql("#{sql_column} #{datatable.effective_resource.sql_direction(direction)}"))
+      if column[:as] == :reorder && sql_column == column[:reorder]
+        attribute = collection.arel_table[column[:reorder]]
+        collection.order(direction.to_s.downcase == 'desc' ? attribute.desc : attribute.asc)
+      elsif column[:sql_as_column]
+        expression = Arel.sql(sql_column.to_s)
+        collection.order(direction.to_s.downcase == 'desc' ? expression.desc : expression.asc)
       else
         Effective::Resource.new(collection)
           .order(column[:name], direction, as: column[:as], sort: column[:sort], sql_column: column[:sql_column], limit: datatable.limit)
@@ -99,12 +103,7 @@ module Effective
       when Hash
         count.size  # This represents the number of displayed datatable rows, not the sum all groups (which might be more)
       else
-        if collection.klass.connection.respond_to?(:unprepared_statement)
-          collection_sql = collection.klass.connection.unprepared_statement { collection.to_sql }
-          (collection.klass.connection.exec_query("SELECT COUNT(*) FROM (#{collection_sql}) AS datatables_total_count").rows[0][0] rescue 1)
-        else
-          (collection.klass.connection.exec_query("SELECT COUNT(*) FROM (#{collection.to_sql}) AS datatables_total_count").rows[0][0] rescue 1)
-        end.to_i
+        (collection.klass.unscoped.from(collection, :datatables_total_count).count(:all) rescue 1).to_i
       end
     end
 

data/app/models/effective/effective_datatable/format.rb

@@ -103,7 +103,7 @@ module Effective
 
       # Must return a string
       def format_column(value, column, as: nil, csv: false)
-        return if value.nil? || (column[:resource] && value.blank?)
+        return if value.nil? || (column[:resource] && value != false && value.blank?)
 
         if value.kind_of?(Array) && [:string, :text].include?(column[:as])
           if csv

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.39.0'.freeze
+  VERSION = '4.39.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.39.0
+  version: 4.39.2
 platform: ruby
 authors:
 - Code and Effect