diff options
| author | Maxime Quandalle <maxime@quandalle.com> | 2015-09-21 00:36:22 +0200 |
|---|---|---|
| committer | Maxime Quandalle <maxime@quandalle.com> | 2015-09-21 00:36:22 +0200 |
| commit | 5f239754d6fdb8d5df6b7844c379bd49eb16765c (patch) | |
| tree | 2d1b3b6fc6cb03a828497214ddaa99c25d90aaac | |
| parent | 33888f9fbbe61376c2390a9b6d07f123eda23624 (diff) | |
| parent | bf8f335ae7748ab43fa19aa6c9a6395180f22452 (diff) | |
| download | wekan-5f239754d6fdb8d5df6b7844c379bd49eb16765c.tar.gz wekan-5f239754d6fdb8d5df6b7844c379bd49eb16765c.tar.bz2 wekan-5f239754d6fdb8d5df6b7844c379bd49eb16765c.zip | |
Merge pull request #317 from AlexanderS/fix/remove-member
Fix removeMemberPopup
| -rw-r--r-- | client/components/sidebar/sidebar.jade | 2 | ||||
| -rw-r--r-- | client/components/sidebar/sidebar.js | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/client/components/sidebar/sidebar.jade b/client/components/sidebar/sidebar.jade index b90b1b91..91047056 100644 --- a/client/components/sidebar/sidebar.jade +++ b/client/components/sidebar/sidebar.jade @@ -76,7 +76,7 @@ template(name="memberPopup") template(name="removeMemberPopup") - p {{_ 'remove-member-pop' name=user.profile.name username=user.username boardTitle=board.title}} + p {{_ 'remove-member-pop' name=user.profile.fullname username=user.username boardTitle=board.title}} button.js-confirm.negate.full(type="submit") {{_ 'remove-member'}} template(name="addMemberPopup") diff --git a/client/components/sidebar/sidebar.js b/client/components/sidebar/sidebar.js index 8c58c37e..ff65ad9d 100644 --- a/client/components/sidebar/sidebar.js +++ b/client/components/sidebar/sidebar.js @@ -137,6 +137,15 @@ Template.memberPopup.events({ }, }); +Template.removeMemberPopup.helpers({ + user() { + return Users.findOne(this.userId); + }, + board() { + return Boards.findOne(Session.get('currentBoard')); + }, +}); + Template.membersWidget.events({ 'click .js-member': Popup.open('member'), 'click .js-manage-board-members': Popup.open('addMember'), |