Merge pull request from vikhyat/serialize-params

Route `serialize` hook argument is the model, not params
This commit is contained in:
Régis Hanol 2014-03-19 09:30:26 +01:00
commit 80bfdeee82
2 changed files with 5 additions and 5 deletions
app/assets/javascripts
admin/routes
discourse/routes

View file

@ -8,8 +8,8 @@
**/
Discourse.AdminUserRoute = Discourse.Route.extend({
serialize: function(params) {
return { username: Em.get(params, 'username').toLowerCase() };
serialize: function(model) {
return { username: model.get('username').toLowerCase() };
},
model: function(params) {

View file

@ -39,9 +39,9 @@ Discourse.UserRoute = Discourse.Route.extend({
return this.modelFor('user').findDetails();
},
serialize: function(params) {
if (!params) return {};
return { username: Em.get(params, 'username').toLowerCase() };
serialize: function(model) {
if (!model) return {};
return { username: model.get('username').toLowerCase() };
},
setupController: function(controller, user) {