asc/sportspress
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor

Browse Source
This commit is contained in:
Nabil Kadimi
2018-05-26 15:39:02 +00:00
parent d9bdaa20c8
commit b13a9c4db4
3 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
includes/abstracts/abstract-sp-custom-post.php
View File

@@ -82,9 +82,7 @@ abstract class SP_Custom_Post {
public function get_terms_sorted_by_sp_order( $taxonomy ) { public function get_terms_sorted_by_sp_order( $taxonomy ) {
$terms = get_the_terms( $this->ID, $taxonomy ); $terms = get_the_terms( $this->ID, $taxonomy );
if ( $terms ) { if ( $terms ) {
usort( $terms, function( $a, $b ) { usort( $terms, 'sp_sort_terms' );
return get_term_meta( $a->term_id, 'sp_order', true ) > get_term_meta( $b->term_id, 'sp_order', true );
} );
} }
return $terms; return $terms;
} }

7
includes/class-sp-player.php
View File

@@ -123,10 +123,11 @@ class SP_Player extends SP_Custom_Post {
), ),
), ),
); );
$seasons = (array)get_the_terms( $this->ID, 'sp_season', $args ); $seasons = (array) $this->get_terms_sorted_by_sp_order( 'sp_season' );
$leagues = (array) sp_array_value( (array)get_post_meta( $this->ID, 'sp_leagues', true ), $league_id );
uksort( $leagues, 'sp_sort_terms' );
$metrics = (array)get_post_meta( $this->ID, 'sp_metrics', true ); $metrics = (array)get_post_meta( $this->ID, 'sp_metrics', true );
$stats = (array)get_post_meta( $this->ID, 'sp_statistics', true ); $stats = (array)get_post_meta( $this->ID, 'sp_statistics', true );
$leagues = (array) sp_array_value( (array)get_post_meta( $this->ID, 'sp_leagues', true ), $league_id );
$manual_columns = 'manual' == get_option( 'sportspress_player_columns', 'auto' ) ? true : false; $manual_columns = 'manual' == get_option( 'sportspress_player_columns', 'auto' ) ? true : false;
$season_ids = array_filter(wp_list_pluck( $seasons, 'term_id' )); $season_ids = array_filter(wp_list_pluck( $seasons, 'term_id' ));
@@ -136,7 +137,7 @@ class SP_Player extends SP_Custom_Post {
} }
$leagues = array_replace( $season_order, $leagues ); $leagues = array_replace( $season_order, $leagues );
// Get performance labels // Get performance labels
$args = array( $args = array(
'post_type' => array( 'sp_performance' ), 'post_type' => array( 'sp_performance' ),

20
includes/sp-core-functions.php
View File

@@ -1463,6 +1463,26 @@ if ( !function_exists( 'sp_sort_table_teams' ) ) {
} }
} }
if ( ! function_exists( 'sp_sort_terms' ) ) {
/**
* Sorts terms by `sp_order`.
*
* @param int|object $a Term ID or term.
* @param int|object $b Term ID or term.
* @return int Sorting order.
*/
function sp_sort_terms( $a, $b ) {
if ( is_int( $a ) ) {
$a = get_term( $a );
}
if ( is_int( $b ) ) {
$b = get_term( $b );
}
return get_term_meta( $a->term_id, 'sp_order', true ) > get_term_meta( $b->term_id, 'sp_order', true );
}
}
if ( !function_exists( 'sp_get_next_event' ) ) { if ( !function_exists( 'sp_get_next_event' ) ) {
function sp_get_next_event( $args = array() ) { function sp_get_next_event( $args = array() ) {
$options = array( $options = array(