<!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][13192] trunk/src/bp-templates/bp-nouveau: Stop using the `&&` operator inside the Group invites JS templates</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/13192">13192</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/13192","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>2021-12-17 19:34:03 +0000 (Fri, 17 Dec 2021)</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'>Stop using the `&&` operator inside the Group invites JS templates
The BP Nouveau template pack's Invite UI is failing to render the fetched members when the active theme is supporting the WordPress Full Site editing. The reason is the underscore JS library weirdly doesn't recognize the `&&` operator. To avoid this issue, we've edited the Nouveau Ajax actions/ Group Invites JS templates to set new properties making this operator useless.
This commit also improves the user feedback when invites are restricted to mods or admin (or both) and the current user is a regular group member.
See <a href="http://buddypress.trac.wordpress.org/ticket/8474">#8474</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>
</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 2021-12-17 18:49:32 UTC (rev 13191)
+++ trunk/src/bp-templates/bp-nouveau/buddypress/common/js-templates/invites/index.php 2021-12-17 19:34:03 UTC (rev 13192)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,7 +6,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * dealing with invites.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @version 6.0.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @version 10.0.0
</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">@@ -57,10 +57,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> {{data.name}}
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <# if ( undefined !== data.is_sent ) { #>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <# if ( 'invited' === data.scope ) { #>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="item-meta">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <# if ( undefined !== data.invited_by ) { #>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <# if ( data.invited_by.length > 0 ) { #>
</ins><span class="cx" style="display: block; padding: 0 10px"> <ul class="group-inviters">
</span><span class="cx" style="display: block; padding: 0 10px"> <li><?php esc_html_e( 'Invited by:', 'buddypress' ); ?></li>
</span><span class="cx" style="display: block; padding: 0 10px"> <# for ( i in data.invited_by ) { #>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,7 +82,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="action">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <# if ( undefined === data.is_sent || ( false === data.is_sent && true === data.can_edit ) ) { #>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <# if ( true === data.can_invite ) { #>
</ins><span class="cx" style="display: block; padding: 0 10px"> <button type="button" class="button invite-button group-add-remove-invite-button bp-tooltip bp-icons<# if ( data.selected ) { #> selected<# } #>" data-bp-tooltip="<# if ( data.selected ) { #><?php esc_attr_e( 'Cancel invitation', 'buddypress' ); ?><# } else { #><?php echo esc_attr_x( 'Invite', 'button', 'buddypress' ); ?><# } #>">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="icons" aria-hidden="true"></span>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="bp-screen-reader-text">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,7 +95,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </button>
</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">- <# if ( undefined !== data.can_edit && true === data.can_edit ) { #>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <# if ( true === data.can_edit ) { #>
</ins><span class="cx" style="display: block; padding: 0 10px"> <button type="button" class="button invite-button group-remove-invite-button bp-tooltip bp-icons" data-bp-tooltip="<?php echo esc_attr_x( 'Cancel invitation', 'button', 'buddypress' ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class=" icons" aria-hidden="true"></span>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="bp-screen-reader-text"><?php echo esc_attr_x( 'Cancel invitation', 'button', 'buddypress' ); ?></span>
</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 2021-12-17 18:49:32 UTC (rev 13191)
+++ trunk/src/bp-templates/bp-nouveau/includes/groups/ajax.php 2021-12-17 19:34:03 UTC (rev 13192)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -283,6 +283,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error( $response );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! bp_is_group_create() && ! bp_groups_user_can_send_invites( bp_get_current_group_id(), bp_loggedin_user_id() ) ) {
+ $invite_status = bp_group_get_invite_status( bp_get_current_group_id() );
+ if ( 'admins' === $invite_status ) {
+ $message = __( 'Inviting members to join this group is restricted to Group Administrators.', 'buddypress' );
+ } else {
+ $message = __( 'Inviting members to join this group is restricted to Group Moderators and Administrators.', 'buddypress' );
+ }
+
+ wp_send_json_error(
+ array(
+ 'feedback' => $message,
+ 'type' => 'error',
+ )
+ );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $request = bp_parse_args(
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST,
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</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 2021-12-17 18:49:32 UTC (rev 13191)
+++ trunk/src/bp-templates/bp-nouveau/includes/groups/functions.php 2021-12-17 19:34:03 UTC (rev 13192)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -199,27 +199,38 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_nouveau_prepare_group_potential_invites_for_js( $user ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $bp = buddypress();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $bp = buddypress();
+ $scope = '';
+ if ( isset( $bp->groups->invites_scope ) ) {
+ $scope = $bp->groups->invites_scope;
+ }
</ins><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">- 'id' => intval( $user->ID ),
- 'name' => $user->display_name,
- 'avatar' => htmlspecialchars_decode( bp_core_fetch_avatar( array(
- 'item_id' => $user->ID,
- 'object' => 'user',
- 'type' => 'thumb',
- 'width' => 50,
- 'height' => 50,
- 'html' => false )
- ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'id' => intval( $user->ID ),
+ 'name' => $user->display_name,
+ 'avatar' => htmlspecialchars_decode(
+ bp_core_fetch_avatar(
+ array(
+ 'item_id' => $user->ID,
+ 'object' => 'user',
+ 'type' => 'thumb',
+ 'width' => 50,
+ 'height' => 50,
+ 'html' => false
+ )
+ )
+ ),
+ 'scope' => $scope,
+ 'is_sent' => false,
+ 'invited_by' => array(),
+ 'can_invite' => 'invited' !== $scope,
</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"> // Do extra queries only if needed
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $bp->groups->invites_scope ) && 'invited' === $bp->groups->invites_scope ) {
- $response['is_sent'] = (bool) groups_check_user_has_invite( $user->ID, bp_get_current_group_id() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'invited' === $scope ) {
+ $response['is_sent'] = (bool) groups_check_user_has_invite( $user->ID, bp_get_current_group_id() );
+ $inviter_ids = bp_nouveau_groups_get_inviter_ids( $user->ID, bp_get_current_group_id() );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $inviter_ids = bp_nouveau_groups_get_inviter_ids( $user->ID, bp_get_current_group_id() );
-
</del><span class="cx" style="display: block; padding: 0 10px"> foreach ( $inviter_ids as $inviter_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $class = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -228,25 +239,25 @@
</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"> $response['invited_by'][] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'avatar' => htmlspecialchars_decode( bp_core_fetch_avatar( array(
- 'item_id' => $inviter_id,
- 'object' => 'user',
- 'type' => 'thumb',
- 'width' => 50,
- 'height' => 50,
- 'html' => false,
- 'class' => $class,
- ) ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'avatar' => htmlspecialchars_decode(
+ bp_core_fetch_avatar(
+ array(
+ 'item_id' => $inviter_id,
+ 'object' => 'user',
+ 'type' => 'thumb',
+ 'width' => 50,
+ 'height' => 50,
+ 'html' => false,
+ 'class' => $class,
+ )
+ )
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_link' => bp_core_get_userlink( $inviter_id, false, true ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_name' => bp_core_get_username( $inviter_id ),
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( bp_is_item_admin() ) {
- $response['can_edit'] = true;
- } else {
- $response['can_edit'] = in_array( bp_loggedin_user_id(), $inviter_ids, true );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response['can_edit'] = bp_is_item_admin() || in_array( bp_loggedin_user_id(), $inviter_ids, true );
</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>