active-list 4.1.2 → 4.1.3

data/VERSION

@@ -1 +1 @@
-4.1.2
+4.1.3

data/lib/active-list/generator.rb

@@ -63,11 +63,11 @@ module ActiveList
       code += "options = (params||{}).merge(options)\n"
       # Session values
       code += "session[:list] = {} unless session[:list].is_a? Hash\n"
-      code += "session[:list][:#{self.view_method_name}] = {} unless session[:list][:#{self.view_method_name}].is_a? Hash\n"
+      code += "session[:list][:#{self.view_method_name}] = {} unless session[:list][:#{self.view_method_name}].is_a? Hash\n"      
       code += "list_params = session[:list][:#{self.view_method_name}]\n"
       code += "list_params[:hidden_columns] = [] unless list_params[:hidden_columns].is_a? Array\n"
       for parameter, convertor in @parameters.sort{|a,b| a[0].to_s <=> b[0].to_s}
-        expr = "options['#{self.name}_#{parameter}'] || options['#{parameter}'] || list_params[:#{parameter}]"
+        expr = "options.delete('#{self.name}_#{parameter}') || options.delete('#{parameter}') || list_params[:#{parameter}]"
         expr += " || #{@options[parameter]}" unless @options[parameter].blank?
         code += "list_params[:#{parameter}] = (#{expr}).#{convertor}\n"
       end

data/lib/active-list/renderers/simple_renderer.rb

@@ -68,7 +68,7 @@ module ActiveList
       code << "return tbody.html_safe if options[:only] == 'body' or options[:only] == 'tbody'\n"
 
       code << "html = ''\n"
-      code << "html << '<div id=\"#{table.name}\" data-list-source=\"'+h(url_for({:action => '#{table.controller_method_name}'}))+'\" class=\"active-list\""
+      code << "html << '<div id=\"#{table.name}\" data-list-source=\"'+h(url_for(options.merge(:action => '#{table.controller_method_name}')))+'\" class=\"active-list\""
       code << " data-list-current-page=\"' + #{table.records_variable_name}_page.to_s + '\" data-list-page-size=\"' + #{table.records_variable_name}_limit.to_s + '\""
       code << " data-list-sort-by=\"' + list_params[:sort].to_s + '\" data-list-sort-dir=\"' + list_params[:dir].to_s + '\""
       code << ">'\n"

metadata

@@ -2,7 +2,7 @@
 name: active-list
 version: !ruby/object:Gem::Version
   version: !binary |-
-    NC4xLjI=
+    NC4xLjM=
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-24 00:00:00.000000000 Z
+date: 2012-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails