diff options
author | floatinghotpot <rjfun.mobile@gmail.com> | 2015-12-08 16:03:31 +0800 |
---|---|---|
committer | floatinghotpot <rjfun.mobile@gmail.com> | 2015-12-08 16:03:31 +0800 |
commit | 672c21bfe043c557c059086561113a6a1dfefb42 (patch) | |
tree | 07a01706d6f8abba1ee7aeb393c991db28ef3b15 /client/components/sidebar/sidebar.js | |
parent | b719968df5577af6dd69eb32f6c2e2a43a322e87 (diff) | |
download | wekan-672c21bfe043c557c059086561113a6a1dfefb42.tar.gz wekan-672c21bfe043c557c059086561113a6a1dfefb42.tar.bz2 wekan-672c21bfe043c557c059086561113a6a1dfefb42.zip |
bugfix: only care active members, also optimize some code
Diffstat (limited to 'client/components/sidebar/sidebar.js')
-rw-r--r-- | client/components/sidebar/sidebar.js | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/client/components/sidebar/sidebar.js b/client/components/sidebar/sidebar.js index 5b58dbd9..ec3ebcf6 100644 --- a/client/components/sidebar/sidebar.js +++ b/client/components/sidebar/sidebar.js @@ -279,7 +279,7 @@ BlazeComponent.extendComponent({ 'click .js-select-member'() { const userId = this.currentData()._id; const currentBoard = Boards.findOne(Session.get('currentBoard')); - if (currentBoard.memberIndex(userId)<0) { + if (!currentBoard.hasMember(userId)) { this.inviteUser(userId); } }, @@ -305,16 +305,12 @@ Template.changePermissionsPopup.events({ Template.changePermissionsPopup.helpers({ isAdmin() { - const user = Users.findOne(this.userId); - return user.isBoardAdmin(); + const currentBoard = Boards.findOne(Session.get('currentBoard')); + return currentBoard.hasAdmin(this.userId); }, isLastAdmin() { - const user = Users.findOne(this.userId); - if (!user.isBoardAdmin()) - return false; const currentBoard = Boards.findOne(Session.get('currentBoard')); - const nbAdmins = _.where(currentBoard.members, { isAdmin: true }).length; - return nbAdmins === 1; + return currentBoard.hasAdmin(this.userId) && (currentBoard.activeAdmins() === 1); }, }); |