diff options
| author | Lauri Ojansivu <x@xet7.org> | 2018-05-08 11:14:26 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2018-05-08 11:14:26 +0300 |
| commit | 0ecbb734198280de83f1e306647e5d9d8a3ffef8 (patch) | |
| tree | 0ed596f95d3b46a0080a8869dab90a3b177b8365 /client/components/users | |
| parent | daeb06f7b793f2e9f7590296e45b3d129ccb0a3a (diff) | |
| parent | f3aa524b773f746d44c69fb432b6905bd139792d (diff) | |
| download | wekan-0ecbb734198280de83f1e306647e5d9d8a3ffef8.tar.gz wekan-0ecbb734198280de83f1e306647e5d9d8a3ffef8.tar.bz2 wekan-0ecbb734198280de83f1e306647e5d9d8a3ffef8.zip | |
Merge branch 'devel'
Diffstat (limited to 'client/components/users')
| -rw-r--r-- | client/components/users/userHeader.jade | 5 | ||||
| -rw-r--r-- | client/components/users/userHeader.js | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/client/components/users/userHeader.jade b/client/components/users/userHeader.jade index 4ac59f45..a8fdb143 100644 --- a/client/components/users/userHeader.jade +++ b/client/components/users/userHeader.jade @@ -33,7 +33,10 @@ template(name="editProfilePopup") | {{_ 'username'}} span.error.hide.username-taken | {{_ 'error-username-taken'}} - input.js-profile-username(type="text" value=username) + if allowUserNameChange + input.js-profile-username(type="text" value=username) + else + input.js-profile-username(type="text" value=username readonly) label | {{_ 'initials'}} input.js-profile-initials(type="text" value=profile.initials) diff --git a/client/components/users/userHeader.js b/client/components/users/userHeader.js index be7d4dcb..d96a9b3d 100644 --- a/client/components/users/userHeader.js +++ b/client/components/users/userHeader.js @@ -24,6 +24,9 @@ Template.editProfilePopup.helpers({ allowEmailChange() { return AccountSettings.findOne('accounts-allowEmailChange').booleanValue; }, + allowUserNameChange() { + return AccountSettings.findOne('accounts-allowUserNameChange').booleanValue; + }, }); Template.editProfilePopup.events({ |