diff options
author | Lauri Ojansivu <x@xet7.org> | 2020-01-03 16:02:31 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2020-01-03 16:02:31 +0200 |
commit | 27943796ade78ca3c503637a1340918bf06a1267 (patch) | |
tree | f5732aa18b55d49bb3933ddf65613b707329984c /client/components/users | |
parent | 9b288475928627d76dd7c379caf2b0eede8d9e4a (diff) | |
download | wekan-27943796ade78ca3c503637a1340918bf06a1267.tar.gz wekan-27943796ade78ca3c503637a1340918bf06a1267.tar.bz2 wekan-27943796ade78ca3c503637a1340918bf06a1267.zip |
Revert to Wekan v3.57 version of client and models directories,
removing Worker role temporarily, because Worker role changes
broke saving card.
Thanks to xet7 !
Diffstat (limited to 'client/components/users')
-rw-r--r-- | client/components/users/userAvatar.jade | 1 | ||||
-rw-r--r-- | client/components/users/userHeader.jade | 65 | ||||
-rw-r--r-- | client/components/users/userHeader.js | 24 |
3 files changed, 21 insertions, 69 deletions
diff --git a/client/components/users/userAvatar.jade b/client/components/users/userAvatar.jade index 7f2067ce..ebfa48ba 100644 --- a/client/components/users/userAvatar.jade +++ b/client/components/users/userAvatar.jade @@ -73,7 +73,6 @@ template(name="cardMemberPopup") p.quiet @{{ user.username }} ul.pop-over-list if currentUser.isNotCommentOnly - if currentUser.isNotWorker li: a.js-remove-member {{_ 'remove-member-from-card'}} if $eq currentUser._id user._id diff --git a/client/components/users/userHeader.jade b/client/components/users/userHeader.jade index 9306d21d..50a80396 100644 --- a/client/components/users/userHeader.jade +++ b/client/components/users/userHeader.jade @@ -13,46 +13,21 @@ template(name="headerUserBar") template(name="memberMenuPopup") ul.pop-over-list with currentUser - li - a.js-edit-profile - i.fa.fa-user - | {{_ 'edit-profile'}} - li - a.js-change-settings - i.fa.fa-cog - | {{_ 'change-settings'}} - li - a.js-change-avatar - i.fa.fa-picture-o - | {{_ 'edit-avatar'}} + li: a.js-edit-profile {{_ 'edit-profile'}} + li: a.js-change-settings {{_ 'change-settings'}} + li: a.js-change-avatar {{_ 'edit-avatar'}} unless isSandstorm - li - a.js-change-password - i.fa.fa-key - | {{_ 'changePasswordPopup-title'}} - li - a.js-change-language - i.fa.fa-flag - | {{_ 'changeLanguagePopup-title'}} + li: a.js-change-password {{_ 'changePasswordPopup-title'}} + li: a.js-change-language {{_ 'changeLanguagePopup-title'}} if currentUser.isAdmin - li - a.js-go-setting(href="{{pathFor 'setting'}}") - i.fa.fa-lock - | {{_ 'admin-panel'}} - unless currentUser.isWorker - hr - ul.pop-over-list - li - a(href="{{pathFor 'board' id=templatesBoardId slug=templatesBoardSlug}}") - i.fa.fa-clone - | {{_ 'templates'}} + li: a.js-go-setting(href="{{pathFor 'setting'}}") {{_ 'admin-panel'}} + hr + ul.pop-over-list + li: a(href="{{pathFor 'board' id=templatesBoardId slug=templatesBoardSlug}}") {{_ 'templates'}} unless isSandstorm hr ul.pop-over-list - li - a.js-logout - i.fa.fa-sign-out - | {{_ 'log-out'}} + li: a.js-logout {{_ 'log-out'}} template(name="editProfilePopup") form @@ -100,25 +75,21 @@ template(name="changeSettingsPopup") ul.pop-over-list li a.js-toggle-system-messages - i.fa.fa-comments-o | {{_ 'hide-system-messages'}} if hiddenSystemMessages i.fa.fa-check li a.js-toggle-desktop-drag-handles - i.fa.fa-arrows | {{_ 'show-desktop-drag-handles'}} if showDesktopDragHandles i.fa.fa-check - unless currentUser.isWorker - li - label.bold - i.fa.fa-sort-numeric-asc - | {{_ 'show-cards-minimum-count'}} - input#show-cards-count-at.inline-input.left(type="number" value="#{showCardsCountAt}" min="0" max="99" onkeydown="return false") - input.js-apply-show-cards-at.left(type="submit" value="{{_ 'apply'}}") + li + label.bold + | {{_ 'show-cards-minimum-count'}} + input#show-cards-count-at.inline-input.left(type="number" value="#{showCardsCountAt}" min="0" max="99" onkeydown="return false") + input.js-apply-show-cards-at.left(type="submit" value="{{_ 'apply'}}") + template(name="userDeletePopup") - unless currentUser.isWorker - p {{_ 'delete-user-confirm-popup'}} - button.js-confirm.negate.full(type="submit") {{_ 'delete'}} + p {{_ 'delete-user-confirm-popup'}} + button.js-confirm.negate.full(type="submit") {{_ 'delete'}} diff --git a/client/components/users/userHeader.js b/client/components/users/userHeader.js index 847d30fb..5f36ef54 100644 --- a/client/components/users/userHeader.js +++ b/client/components/users/userHeader.js @@ -45,31 +45,13 @@ Template.memberMenuPopup.events({ Template.editProfilePopup.helpers({ allowEmailChange() { - Meteor.call('AccountSettings.allowEmailChange', (_, result) => { - if (result) { - return true; - } else { - return false; - } - }); + return AccountSettings.findOne('accounts-allowEmailChange').booleanValue; }, allowUserNameChange() { - Meteor.call('AccountSettings.allowUserNameChange', (_, result) => { - if (result) { - return true; - } else { - return false; - } - }); + return AccountSettings.findOne('accounts-allowUserNameChange').booleanValue; }, allowUserDelete() { - Meteor.call('AccountSettings.allowUserDelete', (_, result) => { - if (result) { - return true; - } else { - return false; - } - }); + return AccountSettings.findOne('accounts-allowUserDelete').booleanValue; }, }); |