diff --git src/bp-templates/bp-nouveau/buddypress/common/js-templates/invites/index.php src/bp-templates/bp-nouveau/buddypress/common/js-templates/invites/index.php
index 79aa13acd..0c3813359 100644
|
|
|
82 | 82 | </script> |
83 | 83 | |
84 | 84 | <script type="text/html" id="tmpl-bp-invites-selection"> |
85 | | <a href="#" title="{{data.name}}"> |
86 | | <img src="{{data.avatar}}" class="avatar" alt="{{data.name}}" /> |
| 85 | <a href="#uninvite-user-{{data.id}}" title="{{data.name}}"> |
| 86 | <img src="{{data.avatar}}" class="avatar" title="{{data.name}}"/> |
87 | 87 | </a> |
88 | 88 | </script> |
89 | 89 | |
diff --git src/bp-templates/bp-nouveau/includes/groups/functions.php src/bp-templates/bp-nouveau/includes/groups/functions.php
index 6fc4fa23a..03306d9e2 100644
|
|
function bp_nouveau_groups_localize_scripts( $params = array() ) { |
112 | 112 | |
113 | 113 | // Init the Group invites nav |
114 | 114 | $invites_nav = array( |
115 | | 'members' => array( 'id' => 'members', 'caption' => __( 'All Members', 'buddypress' ), 'order' => 5 ), |
116 | | 'invited' => array( 'id' => 'invited', 'caption' => __( 'Pending Invites', 'buddypress' ), 'order' => 90, 'hide' => (int) ! $show_pending ), |
117 | | 'invites' => array( 'id' => 'invites', 'caption' => __( 'Send Invites', 'buddypress' ), 'order' => 100, 'hide' => 1 ), |
| 115 | 'members' => array( |
| 116 | 'id' => 'members', |
| 117 | 'caption' => __( 'All Members', 'buddypress' ), |
| 118 | 'order' => 5, |
| 119 | ), |
| 120 | 'invited' => array( |
| 121 | 'id' => 'invited', |
| 122 | 'caption' => __( 'Pending Invites', 'buddypress' ), |
| 123 | 'order' => 90, |
| 124 | 'hide' => (int) ! $show_pending, |
| 125 | ), |
| 126 | 'invites' => array( |
| 127 | 'id' => 'invites', |
| 128 | 'caption' => __( 'Send Invites', 'buddypress' ), |
| 129 | 'order' => 100, |
| 130 | 'hide' => 1, |
| 131 | 'href' => '#send-invites-editor', |
| 132 | ), |
118 | 133 | ); |
119 | 134 | |
120 | 135 | if ( bp_is_active( 'friends' ) ) { |
121 | | $invites_nav['friends'] = array( 'id' => 'friends', 'caption' => __( 'My Friends', 'buddypress' ), 'order' => 0 ); |
| 136 | $invites_nav['friends'] = array( |
| 137 | 'id' => 'friends', |
| 138 | 'caption' => __( 'My Friends', 'buddypress' ), |
| 139 | 'order' => 0, |
| 140 | ); |
122 | 141 | |
123 | 142 | if ( true === bp_nouveau_groups_disallow_all_members_invites() ) { |
124 | 143 | unset( $invites_nav['members'] ); |
diff --git src/bp-templates/bp-nouveau/js/buddypress-group-invites.js src/bp-templates/bp-nouveau/js/buddypress-group-invites.js
index f78050d45..14fd2c2d2 100644
|
|
window.bp = window.bp || {}; |
72 | 72 | this.navItems.add( { |
73 | 73 | id : item.id, |
74 | 74 | name : item.caption, |
75 | | href : '#', |
| 75 | href : item.href || '#members-list', |
76 | 76 | active : activeView, |
77 | 77 | hide : _.isUndefined( item.hide ) ? 0 : item.hide |
78 | 78 | } ); |
… |
… |
window.bp = window.bp || {}; |
800 | 800 | |
801 | 801 | initialize: function() { |
802 | 802 | this.model.on( 'change:selected', this.removeView, this ); |
| 803 | this.el.id = 'uninvite-user-' + this.model.get( 'id' ); |
803 | 804 | }, |
804 | 805 | |
805 | 806 | removeSelection: function( event ) { |