lib/data_tables.rb in data_tables-0.1.13 vs lib/data_tables.rb in data_tables-0.1.14

@@ -59,11 +59,10 @@
             return if domain.nil?
           end
           search_condition = params[:sSearch].blank? ? nil : params[:sSearch].to_s
 
           sort_column = params[:iSortCol_0].to_i
-          sort_column = 1 if sort_column == 0
           current_page = (params[:iDisplayStart].to_i/params[:iDisplayLength].to_i rescue 0) + 1
           per_page = params[:iDisplayLength] || 10
           per_page = per_page.to_i
           sort_dir = params[:sSortDir_0] || 'desc'
           column_name_sym = columns[sort_column][:name].to_sym
@@ -194,11 +193,10 @@
             objects =  []
 
             condstr = nil
             unless params[:sSearch].blank?
               sort_column_id = params[:iSortCol_0].to_i
-              sort_column_id = 1 if sort_column_id == 0
               sort_column = columns[sort_column_id]
               if sort_column && sort_column.has_key?(:attribute)
                 condstr = params[:sSearch].gsub(/_/, '\\\\_').gsub(/%/, '\\\\%')
               end
             end
@@ -219,11 +217,11 @@
                       must { all }
                     end
                     except.each do |expt|
                       must_not { term expt[0].to_sym, expt[1].to_s }
                     end
-                  end 
+                  end
                 end
                 filter(:term, domain: domain_name) unless domain_name.blank?
                 es_block.call(self) if es_block.respond_to?(:call)
               end
 
@@ -262,11 +260,10 @@
 
           define_method action.to_sym do
             condition_local = ''
             unless params[:sSearch].blank?
               sort_column_id = params[:iSortCol_0].to_i
-              sort_column_id = 1 if sort_column_id == 0
               sort_column = columns[sort_column_id]
               condstr = params[:sSearch].strip.gsub(/_/, '\\\\_').gsub(/%/, '\\\\%')
 
               search_columns = options[:columns].map{|e| e.class == Symbol ? e : nil }.compact
               condition_local = search_columns.map do |column_name|
@@ -304,10 +301,9 @@
             else
               total_records = modelCls.count :conditions => init_conditions.join(" AND ")
               total_display_records = modelCls.count :conditions => conditions.join(" AND ")
             end
             sort_column = params[:iSortCol_0].to_i
-            sort_column = 1 if sort_column == 0
             current_page = (params[:iDisplayStart].to_i/params[:iDisplayLength].to_i rescue 0)+1
             if named_scope
                 objects = modelCls.send(named_scope, *args).paginate(:page => current_page,
                                             :order => "#{columns[sort_column][:name]} #{params[:sSortDir_0]}",
                                             :conditions => conditions.join(" AND "),