Fix issue with custom parameters

stakach · Feb 2, 2012 · 2b3445b · 2b3445b
1 parent 893f99f
commit 2b3445b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/assets/javascripts/resolute/resumables.js b/app/assets/javascripts/resolute/resumables.js
@@ -134,7 +134,7 @@
 				};
 
 				if(!!options.additionalParameters)
-					params['resume[paramters]'] = JSON.stringify(typeof(options.additionalParameters) == 'function' ? options.additionalParameters(file) : options.additionalParameters);
+					params['resume[custom]'] = JSON.stringify(typeof(options.additionalParameters) == 'function' ? options.additionalParameters(file) : options.additionalParameters);
 
 				//
 				// Ensure the slice method is defined

diff --git a/app/controllers/resolute/resumables_controller.rb b/app/controllers/resolute/resumables_controller.rb
@@ -159,7 +159,7 @@ def get_current_user
 			instance_eval &Resolute.current_user
 		end
 
-		def inform_upload_completed(user, oringinal_name, current_path, custom_parameters = nil, db_entry = nil)
+		def inform_upload_completed(user, oringinal_name, current_path, custom_parameters = {}, db_entry = nil)
 			result = {
 				:user => user,
 				:filename => oringinal_name,