Combine reverse teams option

This commit is contained in:
Brian Miyaji
2016-05-24 15:56:23 +10:00
parent 9d9c0bf2a5
commit 8d77e7ae3c
4 changed files with 15 additions and 18 deletions

View File

@@ -122,6 +122,14 @@ class SP_Settings_Events extends SP_Settings_Page {
'id' => 'sportspress_event_filter_teams_by_season',
'default' => 'no',
'type' => 'checkbox',
'checkboxgroup' => '',
),
array(
'desc' => __( 'Reverse order', 'sportspress' ),
'id' => 'sportspress_event_reverse_teams',
'default' => 'no',
'type' => 'checkbox',
'checkboxgroup' => 'end',
),
@@ -256,14 +264,6 @@ class SP_Settings_Events extends SP_Settings_Page {
'manual' => __( 'Manual', 'sportspress' ),
),
),
array(
'title' => __( 'Teams', 'sportspress' ),
'desc' => __( 'Reverse order', 'sportspress' ),
'id' => 'sportspress_event_results_reverse_teams',
'default' => 'no',
'type' => 'checkbox',
),
array(
'title' => __( 'Outcome', 'sportspress' ),
@@ -330,14 +330,6 @@ class SP_Settings_Events extends SP_Settings_Page {
),
),
array(
'title' => __( 'Teams', 'sportspress' ),
'desc' => __( 'Reverse order', 'sportspress' ),
'id' => 'sportspress_event_performance_reverse_teams',
'default' => 'no',
'type' => 'checkbox',
),
array(
'title' => __( 'Positions', 'sportspress' ),
'desc' => __( 'Top-level only', 'sportspress' ),

View File

@@ -45,7 +45,7 @@ class SP_Event extends SP_Custom_Post{
// Get results for all teams
$data = sp_array_combine( $teams, $results, true );
if ( 'yes' === get_option( 'sportspress_event_results_reverse_teams', 'no' ) ) {
if ( 'yes' === get_option( 'sportspress_event_reverse_teams', 'no' ) ) {
$data = array_reverse( $data, true );
}

View File

@@ -404,6 +404,11 @@ class SP_Install {
if ( version_compare( $version, '2.0', '<' ) ) {
update_option( 'sportspress_player_columns', 'manual' );
}
if ( version_compare( $version, '2.1', '<' ) ) {
$option = get_option( 'sportspress_event_results_reverse_teams', 'no' );
update_option( 'sportspress_event_reverse_teams', $option );
}
}
/**

View File

@@ -16,7 +16,7 @@ $show_total = get_option( 'sportspress_event_show_total', 'yes' ) === 'yes' ? tr
$show_numbers = get_option( 'sportspress_event_show_player_numbers', 'yes' ) === 'yes' ? true : false;
$sections = get_option( 'sportspress_event_performance_sections', -1 );
$abbreviate_teams = get_option( 'sportspress_abbreviate_teams', 'yes' ) === 'yes' ? true : false;
$reverse_teams = get_option( 'sportspress_event_performance_reverse_teams', 'no' ) === 'yes' ? true : false;
$reverse_teams = get_option( 'sportspress_event_reverse_teams', 'no' ) === 'yes' ? true : false;
$primary = sp_get_main_performance_option();
$total = get_option( 'sportspress_event_total_performance', 'all');