From f37651a52b69d7579a50ee9cdd63b3f2aa031dec Mon Sep 17 00:00:00 2001 From: Sebastian Gurlt Date: Wed, 10 Nov 2021 10:31:44 +0100 Subject: [PATCH 1/2] Add option to show league names during post selection. --- .../settings/class-sp-settings-general.php | 9 ++++++++ includes/sp-core-functions.php | 22 ++++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/includes/admin/settings/class-sp-settings-general.php b/includes/admin/settings/class-sp-settings-general.php index b35eec1b..90bbcb69 100644 --- a/includes/admin/settings/class-sp-settings-general.php +++ b/includes/admin/settings/class-sp-settings-general.php @@ -221,6 +221,15 @@ public function get_settings() { 'checkboxgroup' => 'end', ), + array( + 'title' => __( 'Selection', 'sportspress' ), + 'desc' => __( 'Show leagues', 'sportspress' ), + 'id' => 'sportspress_selection_show_leagues', + 'default' => 'no', + 'type' => 'checkbox', + 'desc_tip' => __( 'Show league names during post selection.', 'sportspress' ), + ), + array( 'title' => __( 'Widgets', 'sportspress' ), 'desc' => __( 'Unique', 'sportspress' ), diff --git a/includes/sp-core-functions.php b/includes/sp-core-functions.php index 28b7566b..15e4b48b 100644 --- a/includes/sp-core-functions.php +++ b/includes/sp-core-functions.php @@ -1058,7 +1058,27 @@ function sp_dropdown_pages( $args = array() ) { $class = ''; endif; - printf( '', $this_value, $class, $selected_prop, $post->post_title . ( $args['show_dates'] ? ' (' . $post->post_date . ')' : '' ) ); + $leagues = NULL; + if ( 'yes' == get_option( 'sportspress_selection_show_leagues', 'no' ) ) { + $leagues_terms = get_the_terms( $post->ID, 'sp_league' ); + if( $leagues_terms ) { + if ( count( $leagues_terms ) > 1 ) { + $count = count( $leagues_terms ); + $i = 0; + foreach( $leagues_terms as $leagues_term ) { + if( ++$i === $count ) { + $leagues .= $leagues_term->name; + } else { + $leagues .= $leagues_term->name . ', '; + } + } + } else { + $leagues = $leagues_terms[0]->name; + } + } + } + + printf( '', $this_value, $class, $selected_prop, $post->post_title . ( $args['show_dates'] ? ' (' . $post->post_date . ')' : '' ) . ( $leagues ? ' (' . $leagues .') ' : '' )); endforeach; wp_reset_postdata(); From 9081b29c8b738d3d65442b43c6f0cfa619ca38b0 Mon Sep 17 00:00:00 2001 From: Sebastian Gurlt Date: Wed, 10 Nov 2021 10:38:54 +0100 Subject: [PATCH 2/2] Fix indents --- .../settings/class-sp-settings-general.php | 16 +++---- includes/sp-core-functions.php | 42 +++++++++---------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/includes/admin/settings/class-sp-settings-general.php b/includes/admin/settings/class-sp-settings-general.php index 90bbcb69..482ec01e 100644 --- a/includes/admin/settings/class-sp-settings-general.php +++ b/includes/admin/settings/class-sp-settings-general.php @@ -221,14 +221,14 @@ public function get_settings() { 'checkboxgroup' => 'end', ), - array( - 'title' => __( 'Selection', 'sportspress' ), - 'desc' => __( 'Show leagues', 'sportspress' ), - 'id' => 'sportspress_selection_show_leagues', - 'default' => 'no', - 'type' => 'checkbox', - 'desc_tip' => __( 'Show league names during post selection.', 'sportspress' ), - ), + array( + 'title' => __( 'Selection', 'sportspress' ), + 'desc' => __( 'Show leagues', 'sportspress' ), + 'id' => 'sportspress_selection_show_leagues', + 'default' => 'no', + 'type' => 'checkbox', + 'desc_tip' => __( 'Show league names during post selection.', 'sportspress' ), + ), array( 'title' => __( 'Widgets', 'sportspress' ), diff --git a/includes/sp-core-functions.php b/includes/sp-core-functions.php index 15e4b48b..881b7037 100644 --- a/includes/sp-core-functions.php +++ b/includes/sp-core-functions.php @@ -1058,27 +1058,27 @@ function sp_dropdown_pages( $args = array() ) { $class = ''; endif; - $leagues = NULL; - if ( 'yes' == get_option( 'sportspress_selection_show_leagues', 'no' ) ) { - $leagues_terms = get_the_terms( $post->ID, 'sp_league' ); - if( $leagues_terms ) { - if ( count( $leagues_terms ) > 1 ) { - $count = count( $leagues_terms ); - $i = 0; - foreach( $leagues_terms as $leagues_term ) { - if( ++$i === $count ) { - $leagues .= $leagues_term->name; - } else { - $leagues .= $leagues_term->name . ', '; - } - } - } else { - $leagues = $leagues_terms[0]->name; - } - } - } - - printf( '', $this_value, $class, $selected_prop, $post->post_title . ( $args['show_dates'] ? ' (' . $post->post_date . ')' : '' ) . ( $leagues ? ' (' . $leagues .') ' : '' )); + $leagues = NULL; + if ( 'yes' == get_option( 'sportspress_selection_show_leagues', 'no' ) ) { + $leagues_terms = get_the_terms( $post->ID, 'sp_league' ); + if( $leagues_terms ) { + if ( count( $leagues_terms ) > 1 ) { + $count = count( $leagues_terms ); + $i = 0; + foreach( $leagues_terms as $leagues_term ) { + if( ++$i === $count ) { + $leagues .= $leagues_term->name; + } else { + $leagues .= $leagues_term->name . ', '; + } + } + } else { + $leagues = $leagues_terms[0]->name; + } + } + } + + printf( '', $this_value, $class, $selected_prop, $post->post_title . ( $args['show_dates'] ? ' (' . $post->post_date . ')' : '' ) . ( $leagues ? ' (' . $leagues .') ' : '' )); endforeach; wp_reset_postdata();