Fix deserialize to not merge params into model hook

alexspeller · Apr 3, 2013 · 37f9be2 · 37f9be2
1 parent 5f235ba
commit 37f9be2
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/ember-query.coffee b/ember-query.coffee
@@ -194,11 +194,9 @@ Em.Route.reopen
   defaultController: -> @controllerFor @routeName
 
   deserialize: (params) ->
-    paramsWithQuery = {}
-    Em.merge paramsWithQuery, @queryParams()
-    Em.merge paramsWithQuery, params
-    model = @model paramsWithQuery
-    @deserializeParams @queryParams(), @defaultController()
+    query = @queryParams()
+    model = @model params, query
+    @deserializeParams query, @defaultController()
     @currentModel = model
 
   setup: (context) ->