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

Merge branch 'master' into new-hooks

Browse Source
This commit is contained in:
Brian Miyaji
2017-12-11 12:13:01 +11:00
committed by GitHub
parent fda7d01313 d1e1619780
commit bebe5d45ef
5 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
includes/admin/post-types/meta-boxes/class-sp-meta-box-event-performance.php
View File

@@ -405,7 +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 do_action ( 'sportspress_event_performance_player_selection' ); ?>
<?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 } ?>

7
includes/class-sp-ajax.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:', 'sportspress' ); ?>
<input class="regular-text" type="number" name="event">
</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 = $div.find('[name=event]').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();

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

@@ -45,6 +45,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;
/** /**
* __construct function. * __construct function.
@@ -277,6 +280,10 @@ class SP_Calendar extends SP_Secondary_Post {
), ),
); );
} }
if ( $this->event) {
$args['p'] = $this->event;
}
if ( 'auto' === $this->date && 'any' === $this->status ) { if ( 'auto' === $this->date && 'any' === $this->status ) {
$args['post_status'] = 'publish'; $args['post_status'] = 'publish';

5
includes/sp-api-functions.php
View File

@@ -345,11 +345,12 @@ 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 = '. ' ) {
$name = apply_filters( 'sportspress_player_name', get_the_title( $post ));
$number = sp_get_player_number( $post ); $number = sp_get_player_number( $post );
if ( isset( $number ) && '' !== $number ) { if ( isset( $number ) && '' !== $number ) {
return apply_filters( 'sportspress_event_players', $prepend . $number . $append . get_the_title( $post )); return apply_filters( 'sportspress_player_name_with_number', $prepend . $number . $append . $name);
} else { } else {
return apply_filters( 'sportspress_event_players', get_the_title( $post )); return $name;
} }
} }

5
templates/event-blocks.php
View File

@@ -11,6 +11,7 @@ if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
$defaults = array( $defaults = array(
'id' => null, 'id' => null,
'event' => 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 )
$calendar->event = $event;
if ( $league ) if ( $league )
$calendar->league = $league; $calendar->league = $league;
if ( $season ) if ( $season )
@@ -175,4 +178,4 @@ if ( $title )
if ( $id && $show_all_events_link ) if ( $id && $show_all_events_link )
echo '<div class="sp-calendar-link sp-view-all-link"><a href="' . get_permalink( $id ) . '">' . __( 'View all events', 'sportspress' ) . '</a></div>'; echo '<div class="sp-calendar-link sp-view-all-link"><a href="' . get_permalink( $id ) . '">' . __( 'View all events', 'sportspress' ) . '</a></div>';
?> ?>
</div> </div>