Merge pull request #93 from swissspidy/better-get-columns

Use a filter for get_columns() so providers can add their own columns without passing columns as an argument to get_columns (WP_List_Table::get_columns() doesn't accept any arguments)

Author: rinatkhaziev

common/lib/acm-wp-list-table.php

@@ -24,16 +24,15 @@ function __construct( $params = array() ) {
 	 *
 	 * @return array $columns, the array of columns to use with the table
 	 */
-	function get_columns( $columns = false ) {
-		$default = array(
+	function get_columns() {
+		$columns = apply_filters( 'acm_list_table_columns', array(
 			'cb'             => '<input type="checkbox" />',
 			'id'             => __( 'ID', 'ad-code-manager' ),
 			'name'           => __( 'Name', 'ad-code-manager' ),
 			'priority'       => __( 'Priority', 'ad-code-manager' ),
 			'operator'       => __( 'Logical Operator', 'ad-code-manager' ),
 			'conditionals'   => __( 'Conditionals', 'ad-code-manager' ),
-		);
-		$columns = apply_filters( 'acm_list_table_columns', !is_array( $columns ) || empty( $columns ) ? $default : $columns );
+		) );
 		// Fail-safe for misconfiguration
 		$required_before = array(
 			'id'             => __( 'ID', 'ad-code-manager' ),

providers/doubleclick-for-publishers-async.php

@@ -245,12 +245,11 @@ function __construct() {
 			) );
 	}
 
-
 	/**
-	 * This is nuts and bolts of table representation
+	 * @return array The columns that shall be used
 	 */
-	function get_columns( $columns = null ) {
-		$columns = array(
+	function filter_columns() {
+		return array(
 			'cb'             => '<input type="checkbox" />',
 			'id'             => __( 'ID', 'ad-code-manager' ),
 			'tag'            => __( 'Tag', 'ad-code-manager' ),
@@ -261,7 +260,14 @@ function get_columns( $columns = null ) {
 			'operator'       => __( 'Logical Operator', 'ad-code-manager' ),
 			'conditionals'   => __( 'Conditionals', 'ad-code-manager' ),
 		);
-		return parent::get_columns( $columns );
+	}
+
+	/**
+	 * This is nuts and bolts of table representation
+	 */
+	function get_columns() {
+		add_filter( 'acm_list_table_columns', array( $this, 'filter_columns' ) );
+		return parent::get_columns();
 	}
 
 	/**

providers/doubleclick-for-publishers.php

@@ -93,12 +93,11 @@ function __construct() {
 			) );
 	}
 
-
 	/**
-	 * This is nuts and bolts of table representation
+	 * @return array The columns that shall be used
 	 */
-	function get_columns( $columns = null ) {
-		$columns = array(
+	function filter_columns() {
+		return array(
 			'cb'             => '<input type="checkbox" />',
 			'id'             => __( 'ID', 'ad-code-manager' ),
 			'site_name'      => __( 'Site Name', 'ad-code-manager' ),
@@ -107,7 +106,14 @@ function get_columns( $columns = null ) {
 			'operator'       => __( 'Logical Operator', 'ad-code-manager' ),
 			'conditionals'   => __( 'Conditionals', 'ad-code-manager' ),
 		);
-		return parent::get_columns( $columns );
+	}
+
+	/**
+	 * This is nuts and bolts of table representation
+	 */
+	function get_columns() {
+		add_filter( 'acm_list_table_columns', array( $this, 'filter_columns' ) );
+		return parent::get_columns();
 	}
 
 	/**

providers/google-adsense.php

@@ -161,10 +161,10 @@ public function __construct() {
 	}
 
 	/**
-	 * This is nuts and bolts of table representation
+	 * @return array The columns that shall be used
 	 */
-	function get_columns( $columns = null ) {
-		$columns = array(
+	function filter_columns() {
+		return array(
 			'cb'             => '<input type="checkbox" />',
 			'id'             => __( 'ID', 'ad-code-manager' ),
 			'tag'            => __( 'Tag', 'ad-code-manager' ),
@@ -174,7 +174,14 @@ function get_columns( $columns = null ) {
 			'operator'       => __( 'Logical Operator', 'ad-code-manager' ),
 			'conditionals'   => __( 'Conditionals', 'ad-code-manager' ),
 		);
-		return parent::get_columns( $columns );
+	}
+
+	/**
+	 * This is nuts and bolts of table representation
+	 */
+	function get_columns() {
+		add_filter( 'acm_list_table_columns', array( $this, 'filter_columns' ) );
+		return parent::get_columns();
 	}
 
 	/**