changed the class variables over to instance variables and updated the template"

Joel Quenneville · Joel Quenneville · commit 9d2ff10c0e1a · 2012-04-20T16:36:13.000-05:00
diff --git a/lib/ajax-datatables-rails.rb b/lib/ajax-datatables-rails.rb
@@ -4,25 +4,11 @@ class AjaxDatatablesRails
 
   VERSION = '0.0.1'
 
-  class << self
-
-    def columns(column_array)
-      @@columns ||= column_array
-    end
-
-    def model_name(model_name)
-      @@model_name ||= model_name
-    end
-
-    def searchable_columns(columns_array)
-      @@searchable_columns ||= columns_array
-    end
-
-  end
-
   def initialize(view)
     @view = view
   end
+    
+  attr_reader :columns, :model_name, :searchable_columns
 
   def method_missing(meth, *args, &block)
     @view.send(meth, *args, &block)
@@ -31,7 +17,7 @@ def method_missing(meth, *args, &block)
   def as_json(options = {})
     {
       sEcho: params[:sEcho].to_i,
-      iTotalRecords: @@model_name.count,
+      iTotalRecords: @model_name.count,
       iTotalDisplayRecords: get_raw_records.count,
       aaData: data
     }
@@ -57,7 +43,7 @@ def sort_records(records)
 
   def search_records(records)
     if params[:sSearch].present?
-      query = @@searchable_columns.map do |column|
+      query = @searchable_columns.map do |column|
         "#{column} LIKE :search"
       end.join(" OR ")
       records = records.where(query, search: "%#{params[:sSearch]}%")
@@ -74,7 +60,7 @@ def per_page
   end
 
   def sort_column
-    @@columns[params[:iSortCol_0].to_i]
+    @columns[params[:iSortCol_0].to_i]
   end
 
   def sort_direction
diff --git a/lib/generators/ajaxdatatable/templates/datatable.rb b/lib/generators/ajaxdatatable/templates/datatable.rb
@@ -1,7 +1,11 @@
 class <%= model.classify.pluralize %>Datatable < AjaxDatatablesRails
-  model_name <%= model.classify %>
-  columns # insert array of column names here
-  searchable_columns #insert array of columns that will be searched
+  
+  def initialize(view)
+    @model_name = <%= model.classify %>
+    @columns = # insert array of column names here
+    @searchable_columns = #insert array of columns that will be searched
+    super(view)
+  end
   
 private
 
