Changeset 1660

Timestamp:

06/15/2015 06:25:44 PM (11 years ago)

Author:

iandunn

Message:

WordCamp Payments Dashboard: Get current view from main class.

r31146-core prevents assigning new members to subclasses of WP_List_Table, which caused all items to be displayed on each tab, rather than only the items relevant to the tab.

Location:

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network

Files:

• includes/class-list-table.php (modified) (3 diffs)
• wordcamp-payments-network.php (modified) (2 diffs)

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/class-list-table.php

@@ -41 +41 @@
 
     /**
-     * This list table can display multiple views which are
-     * essentially just filters. Use this method to set the appropriate view.
-     */
-    public function set_view( $view ) {
-        $this->view = 'overdue';
-        if ( in_array( $view, array( 'pending', 'overdue', 'paid' ) ) )
-            $this->view = $view;
-    }
-
-    /**
      * Outputs inline CSS to be used with the list table.
      */
@@ -74 +64 @@
 
         $sql = sprintf( "SELECT SQL_CALC_FOUND_ROWS blog_id, post_id FROM `%s` WHERE 1=1 ", WordCamp_Payments_Network_Tools::get_table_name() );
+        $view = WordCamp_Payments_Network_Tools::get_current_tab();
         $where = '';
         $orderby = '';
@@ -81 +72 @@
         $order = 'desc';
 
-        if ( 'overdue' == $this->view ) {
+        if ( 'overdue' == $view ) {
             $where .= $wpdb->prepare( " AND `status` = 'unpaid' AND `due` > 0 AND `due` <= %d ", time() );
             $orderby = 'due';
             $order = 'asc';
-        } elseif ( 'pending' == $this->view ) {
+        } elseif ( 'pending' == $view ) {
             $where .= " AND `status` = 'unpaid' ";
-        } elseif ( 'paid' == $this->view ) {
+        } elseif ( 'paid' == $view ) {
             $where .= " AND `status` = 'paid' ";
         }

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/wordcamp-payments-network.php

@@ -209 +209 @@
 
         self::$list_table = new WordCamp_Payments_Network_List_Table;
-        self::$list_table->set_view( self::get_current_tab() );
     }
 
@@ -216 +215 @@
      */
     public static function get_current_tab() {
-        if ( isset( $_REQUEST['wcp-section'] ) )
-            return strtolower( $_REQUEST['wcp-section'] );
-
-        return 'overdue';
+        $tab = 'overdue';
+
+        if ( isset( $_REQUEST['wcp-section'] ) && in_array( $_REQUEST['wcp-section'], array( 'pending', 'overdue', 'paid' ) ) ) {
+            $tab = $_REQUEST['wcp-section'];
+        }
+
+        return $tab;
     }