mirror of
https://github.com/codeninjasllc/discourse.git
synced 2025-04-29 07:24:09 -04:00
FIX: Change username view was not loading. Also you can always edit yourself.
This commit is contained in:
parent
e2ce4947d7
commit
82116d5db5
3 changed files with 15 additions and 1 deletions
app
assets/javascripts/discourse
serializers
|
@ -11,6 +11,7 @@ Discourse.PreferencesUsernameController = Discourse.ObjectController.extend({
|
||||||
saving: false,
|
saving: false,
|
||||||
error: false,
|
error: false,
|
||||||
errorMessage: null,
|
errorMessage: null,
|
||||||
|
newUsername: null,
|
||||||
|
|
||||||
saveDisabled: function() {
|
saveDisabled: function() {
|
||||||
if (this.get('saving')) return true;
|
if (this.get('saving')) return true;
|
||||||
|
|
|
@ -9,6 +9,14 @@
|
||||||
Discourse.UserRoute = Discourse.Route.extend({
|
Discourse.UserRoute = Discourse.Route.extend({
|
||||||
|
|
||||||
model: function(params) {
|
model: function(params) {
|
||||||
|
|
||||||
|
// If we're viewing the currently logged in user, return that object
|
||||||
|
// instead.
|
||||||
|
var currentUser = Discourse.User.current();
|
||||||
|
if (params.username.toLowerCase() === currentUser.get('username_lower')) {
|
||||||
|
return currentUser;
|
||||||
|
}
|
||||||
|
|
||||||
return Discourse.User.create({username: params.username});
|
return Discourse.User.create({username: params.username});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,8 @@ class CurrentUserSerializer < BasicUserSerializer
|
||||||
:topic_count,
|
:topic_count,
|
||||||
:enable_quoting,
|
:enable_quoting,
|
||||||
:external_links_in_new_tab,
|
:external_links_in_new_tab,
|
||||||
:trust_level
|
:trust_level,
|
||||||
|
:can_edit
|
||||||
|
|
||||||
def include_site_flagged_posts_count?
|
def include_site_flagged_posts_count?
|
||||||
object.staff?
|
object.staff?
|
||||||
|
@ -30,4 +31,8 @@ class CurrentUserSerializer < BasicUserSerializer
|
||||||
PostAction.flagged_posts_count
|
PostAction.flagged_posts_count
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def can_edit
|
||||||
|
true
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue