<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][12060] trunk/src/bp-templates/bp-nouveau: BP Nouveau: use a JS Template for the Group Invites UI feedbacks</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/12060">12060</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/12060","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-05-05 06:48:40 +0000 (Sat, 05 May 2018)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>BP Nouveau: use a JS Template for the Group Invites UI feedbacks
Using a JS template avoids to transport common HTML tags inside the Ajax replies.
See <a href="http://buddypress.trac.wordpress.org/ticket/7794">#7794</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbptemplatesbpnouveaubuddypresscommonjstemplatesinvitesindexphp">trunk/src/bp-templates/bp-nouveau/buddypress/common/js-templates/invites/index.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveauincludesgroupsajaxphp">trunk/src/bp-templates/bp-nouveau/includes/groups/ajax.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveauincludesgroupsfunctionsphp">trunk/src/bp-templates/bp-nouveau/includes/groups/functions.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveaujsbuddypressgroupinvitesjs">trunk/src/bp-templates/bp-nouveau/js/buddypress-group-invites.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbptemplatesbpnouveaubuddypresscommonjstemplatesinvitesindexphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/buddypress/common/js-templates/invites/index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/buddypress/common/js-templates/invites/index.php 2018-05-05 06:32:09 UTC (rev 12059)
+++ trunk/src/bp-templates/bp-nouveau/buddypress/common/js-templates/invites/index.php 2018-05-05 06:48:40 UTC (rev 12060)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,6 +25,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<script type="text/html" id="tmpl-bp-group-invites-feedback">
+ <div class="bp-feedback {{data.type}}">
+ <span class="bp-icon" aria-hidden="true"></span>
+ <p>{{{data.message}}}</p>
+ </div>
+</script>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <script type="text/html" id="tmpl-bp-invites-nav">
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="{{data.href}}" class="bp-invites-nav-item" data-nav="{{data.id}}">{{data.name}}</a>
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveauincludesgroupsajaxphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/includes/groups/ajax.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/includes/groups/ajax.php 2018-05-05 06:32:09 UTC (rev 12059)
+++ trunk/src/bp-templates/bp-nouveau/includes/groups/ajax.php 2018-05-05 06:48:40 UTC (rev 12060)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -253,7 +253,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $bp = buddypress();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $response = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'feedback' => bp_nouveau_message_markup_wrapper( esc_html__( 'There was a problem performing this action. Please try again.', 'buddypress' ), 'error' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'feedback' => __( 'There was a problem performing this action. Please try again.', 'buddypress' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'error',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -281,12 +281,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $bp->groups->invites_scope = 'members';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $message = bp_nouveau_message_markup_wrapper( __( 'Select members to invite by clicking the + button. Once you\'ve made your selection, use the "Send Invites" nav item to continue.', 'buddypress' ), 'info' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = __( 'Select members to invite by clicking the + button. Once you\'ve made your selection, use the "Send Invites" nav item to continue.', 'buddypress' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'friends' === $request['scope'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $request['user_id'] = bp_loggedin_user_id();
</span><span class="cx" style="display: block; padding: 0 10px"> $bp->groups->invites_scope = 'friends';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $message = bp_nouveau_message_markup_wrapper( __( 'Select friends to invite by clicking the + button. Once you\'ve made your selection, use the "Send Invites" nav item to continue.', 'buddypress' ), 'info' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = __( 'Select friends to invite by clicking the + button. Once you\'ve made your selection, use the "Send Invites" nav item to continue.', 'buddypress' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'invited' === $request['scope'] ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -293,7 +293,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! bp_group_has_invites( array( 'user_id' => 'any' ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'feedback' => bp_nouveau_message_markup_wrapper( __( 'No pending invites found.', 'buddypress' ), 'info' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'feedback' => __( 'No pending invites found.', 'buddypress' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'info',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -300,7 +300,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $request['is_confirmed'] = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $bp->groups->invites_scope = 'invited';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $message = bp_nouveau_message_markup_wrapper( __( 'You can view all the group\'s pending invites from this screen.', 'buddypress' ), 'info' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = __( 'You can view all the group\'s pending invites from this screen.', 'buddypress' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $potential_invites = bp_nouveau_get_group_potential_invites( $request );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -307,19 +307,19 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $potential_invites->users ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $error = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'feedback' => bp_nouveau_message_markup_wrapper( __( 'No members were found. Try another filter.', 'buddypress' ), 'info' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'feedback' => __( 'No members were found. Try another filter.', 'buddypress' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'info',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'friends' === $bp->groups->invites_scope ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $error = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'feedback' => bp_nouveau_message_markup_wrapper( __( 'All your friends are already members of this group, or have already received an invite to join this group, or have requested to join it.', 'buddypress' ), 'info' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'feedback' => __( 'All your friends are already members of this group, or have already received an invite to join this group, or have requested to join it.', 'buddypress' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'info',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 0 === (int) bp_get_total_friend_count( bp_loggedin_user_id() ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $error = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'feedback' => bp_nouveau_message_markup_wrapper( __( 'You have no friends!', 'buddypress' ), 'info' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'feedback' => __( 'You have no friends!', 'buddypress' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'info',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -348,17 +348,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $bp = buddypress();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $response = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'feedback' => bp_nouveau_message_markup_wrapper( __( 'Invites could not be sent. Please try again.', 'buddypress' ), 'error' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'feedback' => __( 'Invites could not be sent. Please try again.', 'buddypress' ),
+ 'type' => 'error',
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Verify nonce
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $_POST['_wpnonce'] ) || ! wp_verify_nonce( $_POST['_wpnonce'], 'groups_send_invites' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_send_json_error(
- array(
- 'feedback' => bp_nouveau_message_markup_wrapper( __( 'Invites could not be sent. Please try again.', 'buddypress' ), 'error' ),
- 'type' => 'error',
- )
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_send_json_error( $response );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $group_id = bp_get_current_group_id();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -368,12 +364,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! bp_groups_user_can_send_invites( $group_id ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_send_json_error(
- array(
- 'feedback' => bp_nouveau_message_markup_wrapper( __( 'You are not allowed to send invites for this group.', 'buddypress' ), 'error' ),
- 'type' => 'error',
- )
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response['feedback'] = __( 'You are not allowed to send invites for this group.', 'buddypress' );
+ wp_send_json_error( $response );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $_POST['users'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -415,7 +407,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'feedback' => bp_nouveau_message_markup_wrapper( esc_html( $error_message ), 'error' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'feedback' => $error_message,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'users' => $errors,
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'error',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -424,7 +416,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_success(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'feedback' => bp_nouveau_message_markup_wrapper( __( 'Invites sent.', 'buddypress' ), 'success' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'feedback' => __( 'Invites sent.', 'buddypress' ),
+ 'type' => 'success',
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -440,7 +433,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $_POST['_wpnonce'] ) || ! wp_verify_nonce( $_POST['_wpnonce'], 'groups_invite_uninvite_user' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'feedback' => bp_nouveau_message_markup_wrapper( __( 'Invites could not be removed. Please try again.', 'buddypress' ), 'error' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'feedback' => __( 'Invites could not be removed. Please try again.', 'buddypress' ),
+ 'type' => 'error',
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -448,7 +442,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( BP_Groups_Member::check_for_membership_request( $user_id, $group_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'feedback' => bp_nouveau_message_markup_wrapper( __( 'Too late! The user is already a member of the group.', 'buddypress' ), 'warning' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'feedback' => __( 'Too late! The user is already a member of the group.', 'buddypress' ),
+ 'type' => 'warning',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'code' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -458,7 +453,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! groups_uninvite_user( $user_id, $group_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'feedback' => bp_nouveau_message_markup_wrapper( __( 'Invite could not be removed successfully.', 'buddypress' ), 'error' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'feedback' => __( 'Invite could not be removed successfully.', 'buddypress' ),
+ 'type' => 'error',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'code' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -466,7 +462,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_success(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'feedback' => bp_nouveau_message_markup_wrapper( __( 'No more pending invites for the group.', 'buddypress' ), 'info' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'feedback' => __( 'No more pending invites for the group.', 'buddypress' ),
+ 'type' => 'info',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'has_invites' => bp_group_has_invites( array( 'user_id' => 'any' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveauincludesgroupsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/includes/groups/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/includes/groups/functions.php 2018-05-05 06:32:09 UTC (rev 12059)
+++ trunk/src/bp-templates/bp-nouveau/includes/groups/functions.php 2018-05-05 06:48:40 UTC (rev 12060)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,10 +146,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $params['group_invites'] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'nav' => bp_sort_by_key( $invites_nav, 'order', 'num' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'loading' => bp_nouveau_message_markup_wrapper( __( 'Loading members. Please wait.', 'buddypress' ), 'loading' ),
- 'invites_form' => bp_nouveau_message_markup_wrapper( __( 'Use the "Send" button to send your invite or the "Cancel" button to abort.', 'buddypress' ), 'info' ),
- 'invites_form_reset' => bp_nouveau_message_markup_wrapper( __( 'Invites cleared. Please use one of the available tabs to select members to invite.', 'buddypress' ), 'success' ),
- 'invites_sending' => bp_nouveau_message_markup_wrapper( __( 'Sending the invites. Please wait.', 'buddypress' ), 'loading' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'loading' => __( 'Loading members. Please wait.', 'buddypress' ),
+ 'invites_form' => __( 'Use the "Send" button to send your invite or the "Cancel" button to abort.', 'buddypress' ),
+ 'invites_form_reset' => __( 'Invites cleared. Please use one of the available tabs to select members to invite.', 'buddypress' ),
+ 'invites_sending' => __( 'Sending the invites. Please wait.', 'buddypress' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'group_id' => ! bp_get_current_group_id() ? bp_get_new_group_id() : bp_get_current_group_id(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'is_group_create' => bp_is_group_create(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'nonces' => array(
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveaujsbuddypressgroupinvitesjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/js/buddypress-group-invites.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/js/buddypress-group-invites.js 2018-05-05 06:32:09 UTC (rev 12059)
+++ trunk/src/bp-templates/bp-nouveau/js/buddypress-group-invites.js 2018-05-05 06:48:40 UTC (rev 12060)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -338,18 +338,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> bp.Views.Feedback = bp.Nouveau.GroupInvites.View.extend( {
</span><span class="cx" style="display: block; padding: 0 10px"> tagName : 'div',
</span><span class="cx" style="display: block; padding: 0 10px"> className : 'bp-invites-feedback',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ template : bp.template( 'bp-group-invites-feedback' ),
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> initialize: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.value = this.options.value;
-
- if ( this.options.type ) {
- this.el.className += ' ' + this.options.type;
- }
- },
-
- render: function() {
- this.$el.html( this.value );
- return this;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.model = new Backbone.Model( {
+ type: this.options.type || 'info',
+ message: this.options.value
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -715,6 +710,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $( this.el ).addClass( 'bp-hide' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bp.Nouveau.GroupInvites.displayFeedback( BP_Nouveau.group_invites.invites_sending, 'info' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> this.collection.sync( 'create', _.pluck( this.collection.models, 'id' ), {
</span><span class="cx" style="display: block; padding: 0 10px"> success : _.bind( this.invitesSent, this ),
</span><span class="cx" style="display: block; padding: 0 10px"> error : _.bind( this.invitesError, this ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -768,7 +765,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> view.remove();
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bp.Nouveau.GroupInvites.displayFeedback( BP_Nouveau.group_invites.invites_form_reset, 'help' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bp.Nouveau.GroupInvites.displayFeedback( BP_Nouveau.group_invites.invites_form_reset, 'success' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>