Allow disabling of columns orderable to play nice with sortable_columns

mebezac · mebezac · commit 9b9be040874b · 2015-01-27T16:13:42.000-05:00
diff --git a/lib/ajax-datatables-rails/base.rb b/lib/ajax-datatables-rails/base.rb
@@ -139,12 +139,25 @@ def per_page
     end
 
     def sort_column(item)
-      sortable_columns[item['column'].to_i]
+      sortable_columns[sortable_diplayed_columns.index(item[:column])]
     end
 
     def sort_direction(item)
       options = %w(desc asc)
       options.include?(item['dir']) ? item['dir'].upcase : 'ASC'
     end
+
+    def sortable_diplayed_columns
+      @sortable_diplayed_columns ||= generate_sortable_diplayed_columns
+    end
+
+    def generate_sortable_diplayed_columns
+      @sortable_diplayed_columns = []
+      params[:columns].each_value do |column|
+        @sortable_diplayed_columns << column[:data] if column[:orderable] == 'true'
+      end
+      @sortable_diplayed_columns
+    end
+
   end
 end
