<!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][10579] trunk/src/bp-members/classes: Signups Administration: improve the screen management</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 { 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/10579">10579</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/10579","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>2016-02-12 06:22:37 +0000 (Fri, 12 Feb 2016)</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'>Signups Administration: improve the screen management
<a href="http://buddypress.trac.wordpress.org/changeset/10547">r10547</a> introduced some regressions by setting the screen ID to `users` or `users-network` :
- It was not possible anymore to manage the displayed column inside the Screen options.
- All costum columns added to the Users List Table using the filter `manage_users_columns` or `manage_users-network_columns` were also added to the Signups List Table.
To fix these and also make sure it is still possible to add custom views before and after the pending view, we are now using the Signups screen ID and introducing a new function to temporarly set the screen ID to `users` or `users-network` when needed.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/6872">#6872</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpmembersclassesclassbpmembersadminphp">trunk/src/bp-members/classes/class-bp-members-admin.php</a></li>
<li><a href="#trunksrcbpmembersclassesclassbpmemberslisttablephp">trunk/src/bp-members/classes/class-bp-members-list-table.php</a></li>
<li><a href="#trunksrcbpmembersclassesclassbpmembersmslisttablephp">trunk/src/bp-members/classes/class-bp-members-ms-list-table.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpmembersclassesclassbpmembersadminphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-members/classes/class-bp-members-admin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/classes/class-bp-members-admin.php 2016-02-09 10:08:26 UTC (rev 10578)
+++ trunk/src/bp-members/classes/class-bp-members-admin.php 2016-02-12 06:22:37 UTC (rev 10579)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1324,9 +1324,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array The views with the signup view added.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function signup_filter_view( $views = array() ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $role;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove the 'current' class from All if we're on the signups view.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $this->signups_page == get_current_screen()->id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'registered' === $role ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $views['all'] = str_replace( 'class="current"', '', $views['all'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $class = 'current';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcbpmembersclassesclassbpmemberslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-members/classes/class-bp-members-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/classes/class-bp-members-list-table.php 2016-02-09 10:08:26 UTC (rev 10578)
+++ trunk/src/bp-members/classes/class-bp-members-list-table.php 2016-02-12 06:22:37 UTC (rev 10579)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,7 +37,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'ajax' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'plural' => 'signups',
</span><span class="cx" style="display: block; padding: 0 10px"> 'singular' => 'signup',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'screen' => buddypress()->members->admin->users_screen,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'screen' => get_current_screen()->id,
</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">@@ -84,14 +84,35 @@
</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">- * Get the views (the links above the WP List Table).
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Display the users screen views
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 2.0.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 2.5.0
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @uses WP_Users_List_Table::get_views() to get the users views.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global string $role The name of role the users screens is filtered by
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function get_views() {
- return parent::get_views();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function views() {
+ global $role;
+
+ // Used to reset the role
+ $reset_role = $role;
+
+ // Temporarly set the role to registered
+ $role = 'registered';
+
+ // Used to reset the screen id once views are displayed
+ $reset_screen_id = $this->screen->id;
+
+ // Temporarly set the screen id to the users one
+ $this->screen->id = 'users';
+
+ // Use the parent function so that other plugins can safely add views
+ parent::views();
+
+ // Reset the role
+ $role = $reset_role;
+
+ // Reset the screen id
+ $this->screen->id = $reset_screen_id;
</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>
<a id="trunksrcbpmembersclassesclassbpmembersmslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-members/classes/class-bp-members-ms-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/classes/class-bp-members-ms-list-table.php 2016-02-09 10:08:26 UTC (rev 10578)
+++ trunk/src/bp-members/classes/class-bp-members-ms-list-table.php 2016-02-12 06:22:37 UTC (rev 10579)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,7 +37,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'ajax' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'plural' => 'signups',
</span><span class="cx" style="display: block; padding: 0 10px"> 'singular' => 'signup',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'screen' => buddypress()->members->admin->users_screen,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'screen' => get_current_screen()->id,
</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">@@ -85,14 +85,35 @@
</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">- * Get the views : the links above the WP List Table.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Display the users screen views
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 2.0.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 2.5.0
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @uses WP_MS_Users_List_Table::get_views() to get the users views.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global string $role The name of role the users screens is filtered by
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function get_views() {
- return parent::get_views();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function views() {
+ global $role;
+
+ // Used to reset the role
+ $reset_role = $role;
+
+ // Temporarly set the role to registered
+ $role = 'registered';
+
+ // Used to reset the screen id once views are displayed
+ $reset_screen_id = $this->screen->id;
+
+ // Temporarly set the screen id to the users one
+ $this->screen->id = 'users-network';
+
+ // Use the parent function so that other plugins can safely add views
+ parent::views();
+
+ // Reset the role
+ $role = $reset_role;
+
+ // Reset the screen id
+ $this->screen->id = $reset_screen_id;
</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>