Merge pull request #226 from savvasha/master

Add an extra option to shortcode event_blocks to show a specific event using event_id
This commit is contained in:
Brian Miyaji
2017-12-11 12:01:54 +11:00
committed by GitHub
5 changed files with 23 additions and 5 deletions

View File

@@ -405,6 +405,7 @@ class SP_Meta_Box_Event_Performance {
<?php } ?> <?php } ?>
<td> <td>
<?php echo get_the_title( $player_id ); ?> <?php echo get_the_title( $player_id ); ?>
<?php do_action ( 'sportspress_event_selected_players' ); ?>
<?php if ( 1 == $section ) { ?> <?php if ( 1 == $section ) { ?>
<input type="hidden" name="sp_order[<?php echo $team_id; ?>][]" value="<?php echo $player_id; ?>"> <input type="hidden" name="sp_order[<?php echo $team_id; ?>][]" value="<?php echo $player_id; ?>">
<?php } ?> <?php } ?>

View File

@@ -468,6 +468,12 @@ class SP_AJAX {
<input class="regular-text" type="text" name="title"> <input class="regular-text" type="text" name="title">
</label> </label>
</p> </p>
<p>
<label>
<?php _e( 'Event ID:', 'sportspress' ); ?>
<input class="regular-text" type="number" name="event_id">
</label>
</p>
<p> <p>
<label> <label>
<?php printf( __( 'Select %s:', 'sportspress' ), __( 'Calendar', 'sportspress' ) ); ?> <?php printf( __( 'Select %s:', 'sportspress' ), __( 'Calendar', 'sportspress' ) ); ?>
@@ -1031,6 +1037,7 @@ class SP_AJAX {
args.show_all_events_link = $div.find('[name=show_all_events_link]:checked').length; args.show_all_events_link = $div.find('[name=show_all_events_link]:checked').length;
} else if ( 'event_blocks' == type ) { } else if ( 'event_blocks' == type ) {
args.title = $div.find('[name=title]').val(); args.title = $div.find('[name=title]').val();
args.event_id = $div.find('[name=event_id]').val();
args.team = $div.find('[name=team]').val(); args.team = $div.find('[name=team]').val();
args.league = $div.find('[name=league]').val(); args.league = $div.find('[name=league]').val();
args.season = $div.find('[name=season]').val(); args.season = $div.find('[name=season]').val();

View File

@@ -46,6 +46,9 @@ class SP_Calendar extends SP_Secondary_Post {
/** @var int Number of events. */ /** @var int Number of events. */
public $number; public $number;
/** @var int The event ID. */
public $event_id;
/** /**
* __construct function. * __construct function.
* *
@@ -278,6 +281,10 @@ class SP_Calendar extends SP_Secondary_Post {
); );
} }
if ( $this->event_id) {
$args['p'] = $this->event_id;
}
if ( 'auto' === $this->date && 'any' === $this->status ) { if ( 'auto' === $this->date && 'any' === $this->status ) {
$args['post_status'] = 'publish'; $args['post_status'] = 'publish';
$args['order'] = 'DESC'; $args['order'] = 'DESC';

View File

@@ -347,9 +347,9 @@ function sp_get_player_number( $post = 0 ) {
function sp_get_player_name_with_number( $post = 0, $prepend = '', $append = '. ' ) { function sp_get_player_name_with_number( $post = 0, $prepend = '', $append = '. ' ) {
$number = sp_get_player_number( $post ); $number = sp_get_player_number( $post );
if ( isset( $number ) && '' !== $number ) { if ( isset( $number ) && '' !== $number ) {
return $prepend . $number . $append . get_the_title( $post ); return apply_filters( 'sportspress_event_players', $prepend . $number . $append . get_the_title( $post ));
} else { } else {
return get_the_title( $post ); return apply_filters( 'sportspress_event_players', get_the_title( $post ));
} }
} }

View File

@@ -11,6 +11,7 @@ if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
$defaults = array( $defaults = array(
'id' => null, 'id' => null,
'event_id' => null,
'title' => false, 'title' => false,
'status' => 'default', 'status' => 'default',
'date' => 'default', 'date' => 'default',
@@ -58,6 +59,8 @@ if ( $date_future != 'default' )
$calendar->future = $date_future; $calendar->future = $date_future;
if ( $date_relative != 'default' ) if ( $date_relative != 'default' )
$calendar->relative = $date_relative; $calendar->relative = $date_relative;
if ( $event_id )
$calendar->event_id = $event_id;
if ( $league ) if ( $league )
$calendar->league = $league; $calendar->league = $league;
if ( $season ) if ( $season )