Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-02-17 21:48:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Display message when user wants to choose existing username (Fixes: #16)

Browse source
This commit is contained in:
Mario Orlicky 2016-11-18 23:18:16 +01:00
parent 4dc0ec07b8
commit 69fbd31abc
3 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/components/users/userHeader.jade
View file

@ -27,6 +27,8 @@ template(name="editProfilePopup")
input.js-profile-fullname(type="text" value=profile.fullname autofocus) input.js-profile-fullname(type="text" value=profile.fullname autofocus)
label label
| {{_ 'username'}} | {{_ 'username'}}
span.error.hide.username-taken
| {{_ 'error-username-taken'}}
input.js-profile-username(type="text" value=username) input.js-profile-username(type="text" value=username)
label label
| {{_ 'initials'}} | {{_ 'initials'}}

15
client/components/users/userHeader.js
View file

@ -26,11 +26,18 @@ Template.editProfilePopup.events({
'profile.fullname': fullname, 'profile.fullname': fullname,
'profile.initials': initials, 'profile.initials': initials,
}}); }});
// XXX We should report the error to the user.
if (username !== Meteor.user().username) { if (username !== Meteor.user().username) {
Meteor.call('setUsername', username); Meteor.call('setUsername', username, function(error) {
} const messageElement = tpl.$('.username-taken');
Popup.back(); if (error) {
messageElement.show();
} else {
messageElement.hide();
Popup.back();
}
});
} else Popup.back();
}, },
}); });

1
i18n/en.i18n.json
View file

@ -169,6 +169,7 @@
"error-user-doesNotExist": "This user does not exist", "error-user-doesNotExist": "This user does not exist",
"error-user-notAllowSelf": "This action on self is not allowed", "error-user-notAllowSelf": "This action on self is not allowed",
"error-user-notCreated": "This user is not created", "error-user-notCreated": "This user is not created",
"error-username-taken": "This username is already taken",
"export-board": "Export board", "export-board": "Export board",
"filter": "Filter", "filter": "Filter",
"filter-cards": "Filter Cards", "filter-cards": "Filter Cards",