Changeset 10579

Timestamp:

02/12/2016 06:22:37 AM (10 years ago)

Author:

imath

Message:

Signups Administration: improve the screen management

r10547 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 #6872

Location:

trunk/src/bp-members/classes

Files:

• class-bp-members-admin.php (modified) (1 diff)
• class-bp-members-list-table.php (modified) (2 diffs)
• class-bp-members-ms-list-table.php (modified) (2 diffs)

trunk/src/bp-members/classes/class-bp-members-admin.php

@@ -1325 +1325 @@
      */
     public function signup_filter_view( $views = array() ) {
+        global $role;
 
         // Remove the 'current' class from All if we're on the signups view.
-        if ( $this->signups_page == get_current_screen()->id ) {
+        if ( 'registered' === $role ) {
             $views['all'] = str_replace( 'class="current"', '', $views['all'] );
             $class        = 'current';

trunk/src/bp-members/classes/class-bp-members-list-table.php

@@ -38 +38 @@
             'plural'   => 'signups',
             'singular' => 'signup',
-            'screen'   => buddypress()->members->admin->users_screen,
+            'screen'   => get_current_screen()->id,
         ) );
     }
@@ -85 +85 @@
 
     /**
-     * Get the views (the links above the WP List Table).
-     *
-     * @since 2.0.0
-     *
-     * @uses WP_Users_List_Table::get_views() to get the users views.
-     */
-    public function get_views() {
-        return parent::get_views();
+     * Display the users screen views
+     *
+     * @since 2.5.0
+     *
+     * @global string $role The name of role the users screens is filtered by
+     */
+    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;
     }
 

trunk/src/bp-members/classes/class-bp-members-ms-list-table.php

@@ -38 +38 @@
             'plural'   => 'signups',
             'singular' => 'signup',
-            'screen'   => buddypress()->members->admin->users_screen,
+            'screen'   => get_current_screen()->id,
         ) );
     }
@@ -86 +86 @@
 
     /**
-     * Get the views : the links above the WP List Table.
-     *
-     * @since 2.0.0
-     *
-     * @uses WP_MS_Users_List_Table::get_views() to get the users views.
-     */
-    public function get_views() {
-        return parent::get_views();
+     * Display the users screen views
+     *
+     * @since 2.5.0
+     *
+     * @global string $role The name of role the users screens is filtered by
+     */
+    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;
     }