diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-11-27 13:15:00 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2017-11-27 13:15:00 +0200 |
| commit | 162b15c0cdba99c406f41a80a431f2b99f4ff027 (patch) | |
| tree | 7c805aef778c1499befccee51553e2edc681933b | |
| parent | 83efd5b8720f8c97638d0c23c9ef371adf832dac (diff) | |
| parent | 3756b7b0fca2bbb190b4e6937f44eedc9f671b69 (diff) | |
| download | wekan-162b15c0cdba99c406f41a80a431f2b99f4ff027.tar.gz wekan-162b15c0cdba99c406f41a80a431f2b99f4ff027.tar.bz2 wekan-162b15c0cdba99c406f41a80a431f2b99f4ff027.zip | |
Merge branch 'nztqa-issue-1349' into devel
Fix: User with comment only permissions can remove another user from a card.
Thanks to nztqa ! Closes #1349
| -rw-r--r-- | CHANGELOG.md | 10 | ||||
| -rw-r--r-- | client/components/users/userAvatar.jade | 12 |
2 files changed, 15 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a10f120..d0acca4e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,16 @@ +# Upcoming Wekan release + +This release fixes the following bugs: + +* [Fix: User with comment only permissions can remove another user from a card](https://github.com/wekan/wekan/pull/1352). + +Thanks to GitHub user nztqa for contributions. + # v0.59 2017-11-23 Wekan release. This release fixes the following bugs: -* [Fix not working stdout logging by removing Winston logger](https://github.com/wekan/wekan/pull/1352). +* [Remove incomplete logger fix](https://github.com/wekan/wekan/pull/1352). Thanks to GitHub user pierreozoux for contributions. diff --git a/client/components/users/userAvatar.jade b/client/components/users/userAvatar.jade index c61f2365..83e2c8d0 100644 --- a/client/components/users/userAvatar.jade +++ b/client/components/users/userAvatar.jade @@ -71,10 +71,10 @@ template(name="cardMemberPopup") .info h3= user.profile.fullname p.quiet @{{ user.username }} - if currentUser.isBoardMember - ul.pop-over-list - li: a.js-remove-member {{_ 'remove-member-from-card'}} + ul.pop-over-list + if currentUser.isNotCommentOnly + li: a.js-remove-member {{_ 'remove-member-from-card'}} - if $eq currentUser._id user._id - with currentUser - li: a.js-edit-profile {{_ 'edit-profile'}} + if $eq currentUser._id user._id + with currentUser + li: a.js-edit-profile {{_ 'edit-profile'}} |