Merge pull request jbox-web#3 from JoelQ/generators

Joel Quenneville · Joel Quenneville · commit cea90f14f930 · 2012-04-26T12:18:56.000-07:00
Record count changes
diff --git a/lib/ajax-datatables-rails.rb b/lib/ajax-datatables-rails.rb
@@ -18,7 +18,7 @@ def as_json(options = {})
     {
       sEcho: params[:sEcho].to_i,
       iTotalRecords: @model_name.count,
-      iTotalDisplayRecords: get_raw_records.count,
+      iTotalDisplayRecords: get_raw_record_count,
       aaData: data
     }
   end
@@ -29,6 +29,10 @@ def get_raw_records
     raise
   end
 
+  def get_raw_record_count
+    raise
+  end
+  
   def fetch_records
     search_records(sort_records(paginate_records(get_raw_records)))
   end
diff --git a/lib/generators/ajaxdatatable/USAGE b/lib/generators/ajaxdatatable/USAGE
@@ -1,4 +1,2 @@
 Description:
-  The cancan:ability generator creates an Ability class in the models
-  directory. You can move this file anywhere you want as long as it
-  is in the load path.
+  The ajaxdatatable generator creates a *_datatable model in the app/datatables directory. This class inherits from AjaxDatatablesRails
diff --git a/lib/generators/filterdatatable/USAGE b/lib/generators/filterdatatable/USAGE
@@ -0,0 +1,2 @@
+Description:
+  The ajaxdatatable generator creates a *_filter_datatable model in the app/datatables directory. This class overwrites the query in it's parent class
diff --git a/lib/generators/filterdatatable/filterdatatable.rb b/lib/generators/filterdatatable/filterdatatable.rb
@@ -0,0 +1,8 @@
+class FilterdatatableGenerator < Rails::Generators::Base
+  source_root File.expand_path('../templates', __FILE__)
+  argument :model, type: :string
+
+  def generate_ajaxdatatable
+    template 'filter.rb', File.join('app/datatables', "#{model.tableize}_filter_datatable.rb")
+  end
+end
diff --git a/lib/generators/filterdatatable/templates/filter.rb b/lib/generators/filterdatatable/templates/filter.rb
@@ -0,0 +1,8 @@
+class <%= model.classify.pluralize %>FilterDatatable < <%= model.classify.pluralize %>Datatable
+  
+private
+
+  def get_raw_records
+    # insert query here
+  end
+end

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Description:`
	`2`	`+ The ajaxdatatable generator creates a *_filter_datatable model in the app/datatables directory. This class overwrites the query in it's parent class`