Changeset 12551

Timestamp:

02/25/2020 11:51:13 PM (5 years ago)

Author:

imath

Message:

Add the total items amount in Activity and Groups Admin List Tables

The "All" view of the corresponding administration screens is now including the total amount of items between parenthesis.

Props bhargavbhandari90, DJPaul, Hnla

Fixes #7526

Location:

trunk/src

Files:

• bp-activity/classes/class-bp-activity-list-table.php (modified) (7 diffs)
• bp-groups/classes/class-bp-groups-list-table.php (modified) (4 diffs)

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

@@ -40 +40 @@
 
     /**
+     * Total number of activities.
+     *
+     * @since 6.0.0
+     * @var int $all_count
+     */
+    public $all_count = 0;
+
+    /**
      * Store activity-to-user-ID mappings for use in the In Response To column.
      *
@@ -98 +106 @@
 
         // Check if we're on the "Spam" view.
-        if ( !empty( $_REQUEST['activity_status'] ) && 'spam' == $_REQUEST['activity_status'] ) {
+        if ( ! empty( $_REQUEST['activity_status'] ) && 'spam' === $_REQUEST['activity_status'] ) {
             $spam       = 'spam_only';
             $this->view = 'spam';
         }
-
-        // Sort order.
-        if ( !empty( $_REQUEST['order'] ) && 'desc' != $_REQUEST['order'] )
-            $sort = 'ASC';
-
-        // Order by.
-        /*if ( !empty( $_REQUEST['orderby'] ) ) {
-        }*/
 
         // Filter.
         if ( ! empty( $_REQUEST['activity_type'] ) ) {
             $filter = array( 'action' => $_REQUEST['activity_type'] );
+
+            // Set the view as a filtered one.
+            $this->view = 'filtered';
 
             /**
@@ -134 +137 @@
 
         // Are we doing a search?
-        if ( !empty( $_REQUEST['s'] ) )
+        if ( ! empty( $_REQUEST['s'] ) ) {
             $search_terms = $_REQUEST['s'];
 
+            // Set the view as a search request.
+            $this->view = 'search';
+        }
+
         // Check if user has clicked on a specific activity (if so, fetch only that, and any related, activity).
-        if ( !empty( $_REQUEST['aid'] ) )
+        if ( ! empty( $_REQUEST['aid'] ) ) {
             $include_id = (int) $_REQUEST['aid'];
+
+            // Set the view as a single activity.
+            $this->view = 'single';
+        }
 
         // Get the spam total (ignoring any search query or filter).
@@ -161 +172 @@
             'filter_query'     => $filter_query,
             'show_hidden'      => true,
-            // 'sort'             => $sort,
             'spam'             => $spam,
             'count_total'      => 'count_query',
@@ -185 +195 @@
 
         // Set raw data to display.
-        $this->items       = $new_activities;
+        $this->items = $new_activities;
 
         // Store information needed for handling table pagination.
@@ -196 +206 @@
         // Don't truncate activity items; bp_activity_truncate_entry() needs to be used inside a BP_Activity_Template loop.
         remove_filter( 'bp_get_activity_content_body', 'bp_activity_truncate_entry', 5 );
+
+        // Set the Total number of activities.
+        if ( 'all' === $this->view ) {
+            $this->all_count = (int) $activities['total'];
+
+        // Only perform a query if not on the main list view.
+        } elseif ( 'single' !== $this->view ) {
+            $count_activities = bp_activity_get(
+                array(
+                    'fields'      => 'ids',
+                    'show_hidden' => true,
+                    'count_total' => 'count_query',
+                )
+            );
+
+            if ( $count_activities['total'] ) {
+                $this->all_count = (int) $count_activities['total'];
+            }
+        }
     }
 
@@ -310 +339 @@
         <h2 class="screen-reader-text"><?php
             /* translators: accessibility text */
-            _e( 'Filter activities list', 'buddypress' );
+            esc_html_e( 'Filter activities list', 'buddypress' );
         ?></h2>
 
         <ul class="subsubsub">
-            <li class="all"><a href="<?php echo esc_url( $url_base ); ?>" class="<?php if ( 'spam' != $this->view ) echo 'current'; ?>"><?php _e( 'All', 'buddypress' ); ?></a> |</li>
-            <li class="spam"><a href="<?php echo esc_url( add_query_arg( array( 'activity_status' => 'spam' ), $url_base ) ); ?>" class="<?php if ( 'spam' == $this->view ) echo 'current'; ?>"><?php printf( __( 'Spam <span class="count">(%s)</span>', 'buddypress' ), number_format_i18n( $this->spam_count ) ); ?></a></li>
+            <li class="all">
+                <a href="<?php echo esc_url( $url_base ); ?>" class="<?php if ( 'all' === $this->view ) echo 'current'; ?>">
+                <?php printf(
+                        /* translators: %s is the placeholder for the count html tag `<span class="count"/>` */
+                        esc_html__( 'All %s', 'buddypress' ),
+                        sprintf(
+                            '<span class="count">(%s)</span>',
+                            number_format_i18n( $this->all_count )
+                        )
+                    ); ?>
+                </a> |
+            </li>
+            <li class="spam">
+                <a href="<?php echo esc_url( add_query_arg( array( 'activity_status' => 'spam' ), $url_base ) ); ?>" class="<?php if ( 'spam' === $this->view ) echo 'current'; ?>">
+                    <?php printf(
+                        /* translators: %s is the placeholder for the count html tag `<span class="count"/>` */
+                        esc_html__( 'Spam %s', 'buddypress' ),
+                        sprintf(
+                            '<span class="count">(%s)</span>',
+                            number_format_i18n( $this->spam_count )
+                        )
+                    ); ?>
+                </a>
+            </li>
 
             <?php

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

@@ -96 +96 @@
         // Sort order.
         $order = 'DESC';
-        if ( !empty( $_REQUEST['order'] ) ) {
+        if ( ! empty( $_REQUEST['order'] ) ) {
             $order = ( 'desc' == strtolower( $_REQUEST['order'] ) ) ? 'DESC' : 'ASC';
         }
@@ -120 +120 @@
 
         // Are we doing a search?
-        if ( !empty( $_REQUEST['s'] ) )
+        if ( ! empty( $_REQUEST['s'] ) ) {
             $search_terms = $_REQUEST['s'];
 
+            // Set the view as a search request.
+            $this->view = 'search';
+        }
+
         // Check if user has clicked on a specific group (if so, fetch only that group).
-        if ( !empty( $_REQUEST['gid'] ) )
+        if ( ! empty( $_REQUEST['gid'] ) ) {
             $include_id = (int) $_REQUEST['gid'];
 
-        // Set the current view.
+            // Set the view as a single activity.
+            $this->view = 'single';
+        }
+
+        // Use the status request to set the current view.
         if ( isset( $_GET['group_status'] ) && in_array( $_GET['group_status'], array( 'public', 'private', 'hidden' ) ) ) {
             $this->view = $_GET['group_status'];
@@ -187 +195 @@
             'total_pages' => ceil( $groups_template->total_group_count / $per_page )
         ) );
+
+        // Set the Total number of groups.
+        if ( 'all' === $this->view ) {
+            $this->group_counts['all'] = (int) $groups_template->total_group_count;
+
+        // Only perform a query if not on the main list view.
+        } elseif ( 'single' !== $this->view ) {
+            $count_groups = groups_get_groups(
+                array(
+                    'fields'      => 'ids',
+                    'show_hidden' => true,
+                )
+            );
+
+            if ( $count_groups['total'] ) {
+                $this->group_counts['all'] = (int) $count_groups['total'];
+            }
+        }
     }
 
@@ -332 +358 @@
 
         <ul class="subsubsub">
-            <li class="all"><a href="<?php echo esc_url( $url_base ); ?>" class="<?php if ( 'all' == $this->view ) echo 'current'; ?>"><?php _e( 'All', 'buddypress' ); ?></a> |</li>
-            <li class="public"><a href="<?php echo esc_url( add_query_arg( 'group_status', 'public', $url_base ) ); ?>" class="<?php if ( 'public' == $this->view ) echo 'current'; ?>"><?php printf( _n( 'Public <span class="count">(%s)</span>', 'Public <span class="count">(%s)</span>', $this->group_counts['public'], 'buddypress' ), number_format_i18n( $this->group_counts['public'] ) ); ?></a> |</li>
-            <li class="private"><a href="<?php echo esc_url( add_query_arg( 'group_status', 'private', $url_base ) ); ?>" class="<?php if ( 'private' == $this->view ) echo 'current'; ?>"><?php printf( _n( 'Private <span class="count">(%s)</span>', 'Private <span class="count">(%s)</span>', $this->group_counts['private'], 'buddypress' ), number_format_i18n( $this->group_counts['private'] ) ); ?></a> |</li>
-            <li class="hidden"><a href="<?php echo esc_url( add_query_arg( 'group_status', 'hidden', $url_base ) ); ?>" class="<?php if ( 'hidden' == $this->view ) echo 'current'; ?>"><?php printf( _n( 'Hidden <span class="count">(%s)</span>', 'Hidden <span class="count">(%s)</span>', $this->group_counts['hidden'], 'buddypress' ), number_format_i18n( $this->group_counts['hidden'] ) ); ?></a></li>
+            <li class="all">
+                <a href="<?php echo esc_url( $url_base ); ?>" class="<?php if ( 'all' === $this->view ) echo 'current'; ?>">
+                    <?php printf(
+                        /* translators: %s is the placeholder for the count html tag `<span class="count"/>` */
+                        esc_html__( 'All %s', 'buddypress' ),
+                        sprintf(
+                            '<span class="count">(%s)</span>',
+                            number_format_i18n( $this->group_counts['all'] )
+                        )
+                    ); ?>
+                </a> |
+            </li>
+            <li class="public">
+                <a href="<?php echo esc_url( add_query_arg( 'group_status', 'public', $url_base ) ); ?>" class="<?php if ( 'public' === $this->view ) echo 'current'; ?>">
+                    <?php printf(
+                        /* translators: %s is the placeholder for the count html `<span class="count"/>` */
+                        _n( 'Public %s', 'Public %s', $this->group_counts['public'], 'buddypress' ),
+                        sprintf(
+                            '<span class="count">(%s)</span>',
+                            number_format_i18n( $this->group_counts['public'] )
+                        )
+                    ); ?>
+                </a> |
+            </li>
+            <li class="private">
+                <a href="<?php echo esc_url( add_query_arg( 'group_status', 'private', $url_base ) ); ?>" class="<?php if ( 'private' === $this->view ) echo 'current'; ?>">
+                    <?php printf(
+                        /* translators: %s is the placeholder for the count html `<span class="count"/>` */
+                        _n( 'Private %s', 'Private %s', $this->group_counts['private'], 'buddypress' ),
+                        sprintf(
+                            '<span class="count">(%s)</span>',
+                            number_format_i18n( $this->group_counts['private'] )
+                        )
+                    ); ?>
+                </a> |
+            </li>
+            <li class="hidden">
+                <a href="<?php echo esc_url( add_query_arg( 'group_status', 'hidden', $url_base ) ); ?>" class="<?php if ( 'hidden' === $this->view ) echo 'current'; ?>">
+                    <?php printf(
+                        /* translators: %s is the placeholder for the count html tag */
+                        _n( 'Hidden %s', 'Hidden %s', $this->group_counts['hidden'], 'buddypress' ),
+                        sprintf(
+                            '<span class="count">(%s)</span>',
+                            number_format_i18n( $this->group_counts['hidden'] )
+                        )
+                    ); ?>
+                </a>
+            </li>
 
             <?php