Skip to content

Commit

Permalink
Add optional param to columns_get_standard() to return all columns
Browse files Browse the repository at this point in the history
The default behavior is to exclude the fields which are not "active" due
to config settings. The new parameter lets caller override that to
return all standard columns (ie. excluding custom fields).
  • Loading branch information
dregad committed Aug 31, 2012
1 parent 6aaf95d commit 9f57d94
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions core/columns_api.php
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,10 @@ function columns_filter_disabled( $p_columns ) {

/**
* Get a list of standard columns.
* @param bool $p_enabled_columns_only default true, if false returns all columns regardless of config settings
* @return array of column names
*/
function columns_get_standard() {
function columns_get_standard( $p_enabled_columns_only = true ) {
$t_reflection = new ReflectionClass('BugData');
$t_columns = $t_reflection->getDefaultProperties();

Expand All @@ -126,25 +128,25 @@ function columns_get_standard() {
# Overdue icon column (icons appears if an issue is beyond due_date)
$t_columns['overdue'] = null;

if( OFF == config_get( 'enable_profiles' ) ) {
if( $p_enabled_columns_only && OFF == config_get( 'enable_profiles' ) ) {
unset( $t_columns['os'] );
unset( $t_columns['os_build'] );
unset( $t_columns['platform'] );
}

if( config_get( 'enable_eta' ) == OFF ) {
if( $p_enabled_columns_only && config_get( 'enable_eta' ) == OFF ) {
unset( $t_columns['eta'] );
}

if( config_get( 'enable_projection' ) == OFF ) {
if( $p_enabled_columns_only && config_get( 'enable_projection' ) == OFF ) {
unset( $t_columns['projection'] );
}

if( config_get( 'enable_product_build' ) == OFF ) {
if( $p_enabled_columns_only && config_get( 'enable_product_build' ) == OFF ) {
unset( $t_columns['build'] );
}

if( config_get( 'enable_sponsorship' ) == OFF ) {
if( $p_enabled_columns_only && config_get( 'enable_sponsorship' ) == OFF ) {
unset( $t_columns['sponsorship_total'] );
}

Expand All @@ -157,7 +159,7 @@ function columns_get_standard() {
# legacy field
unset( $t_columns['duplicate_id'] );

return array_keys($t_columns);
return array_keys( $t_columns );
}

/**
Expand Down

0 comments on commit 9f57d94

Please sign in to comment.