From 0b9cd325a125532cbe8c6174ca54a01948f806f8 Mon Sep 17 00:00:00 2001
From: Brian Miyaji <brian@themeboy.com>
Date: Sat, 28 Mar 2015 13:18:46 +1100
Subject: [PATCH] Enable multiple team selection in calendars

---
 assets/js/admin/sportspress-admin.js          | 10 ----
 .../class-sp-meta-box-calendar-details.php    | 57 +++++++------------
 includes/class-sp-calendar.php                | 30 +++-------
 3 files changed, 29 insertions(+), 68 deletions(-)

diff --git a/assets/js/admin/sportspress-admin.js b/assets/js/admin/sportspress-admin.js
index 5bf07f9b..eb81d3c5 100644
--- a/assets/js/admin/sportspress-admin.js
+++ b/assets/js/admin/sportspress-admin.js
@@ -557,16 +557,6 @@ jQuery(document).ready(function($){
 	});
 	$(".sp-date-selector select").trigger("change");
 
-	// Show or hide league table selector
-	$(".sp-team-selector .sp-team-picker select").change(function() {
-		console.log( $(this) );
-		if ( $(this).val() == "table" ) {
-			$(this).closest(".sp-team-selector").find(".sp-league-table-picker").show();
-		} else {
-			$(this).closest(".sp-team-selector").find(".sp-league-table-picker").hide();
-		}
-	}).trigger("change");
-
 	// Apply color scheme
 	$(".sp-color-option").on("click", function() {
 		colors = $(this).find("label").data("sp-colors").split(",");
diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-calendar-details.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-calendar-details.php
index 0433eeb9..63015a7a 100644
--- a/includes/admin/post-types/meta-boxes/class-sp-meta-box-calendar-details.php
+++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-calendar-details.php
@@ -24,7 +24,7 @@ class SP_Meta_Box_Calendar_Details {
 		$date = get_post_meta( $post->ID, 'sp_date', true );
 		$date_from = get_post_meta( $post->ID, 'sp_date_from', true );
 		$date_to = get_post_meta( $post->ID, 'sp_date_to', true );
-		$team_id = get_post_meta( $post->ID, 'sp_team', true );
+		$teams = get_post_meta( $post->ID, 'sp_team', false );
 		$table_id = get_post_meta( $post->ID, 'sp_table', true );
 		$order = get_post_meta( $post->ID, 'sp_order', true );
 		?>
@@ -63,40 +63,24 @@ class SP_Meta_Box_Calendar_Details {
 				sp_taxonomy_field( $taxonomy, $post, true );
 			}
 			?>
-			<div class="sp-team-selector">
-				<p><strong><?php _e( 'Team', 'sportspress' ); ?></strong></p>
-				<p class="sp-team-picker">
-					<?php
-					$args = array(
-						'show_option_all' => __( 'All', 'sportspress' ),
-						'post_type' => 'sp_team',
-						'name' => 'sp_team',
-						'selected' => $team_id,
-						'values' => 'ID',
-						'append_options' => array(
-							'table' => sprintf( __( 'Select %s:', 'sportspress' ), __( 'League Table', 'sportspress' ) ),
-						),
-					);
-					if ( ! sp_dropdown_pages( $args ) ):
-						sp_post_adder( 'sp_team', __( 'Add New', 'sportspress' )  );
-					endif;
-					?>
-				</p>
-				<p class="sp-league-table-picker">
-					<?php
-					$args = array(
-						'show_option_all' => __( 'All', 'sportspress' ),
-						'post_type' => 'sp_table',
-						'name' => 'sp_table',
-						'selected' => $table_id,
-						'values' => 'ID',
-					);
-					if ( ! sp_dropdown_pages( $args ) ):
-						sp_post_adder( 'sp_table', __( 'Add New', 'sportspress' )  );
-					endif;
-					?>
-				</p>
-			</div>
+			<p><strong><?php _e( 'Team', 'sportspress' ); ?></strong></p>
+			<p>
+				<?php
+				$args = array(
+					'post_type' => 'sp_team',
+					'name' => 'sp_team[]',
+					'selected' => $teams,
+					'values' => 'ID',
+					'class' => 'widefat',
+					'property' => 'multiple',
+					'chosen' => true,
+					'placeholder' => __( 'All', 'sportspress' ),
+				);
+				if ( ! sp_dropdown_pages( $args ) ):
+					sp_post_adder( 'sp_team', __( 'Add New', 'sportspress' )  );
+				endif;
+				?>
+			</p>
 			<p><strong><?php _e( 'Sort Order', 'sportspress' ); ?></strong></p>
 			<p>
 				<select name="sp_order">
@@ -117,7 +101,6 @@ class SP_Meta_Box_Calendar_Details {
 		update_post_meta( $post_id, 'sp_date_from', sp_array_value( $_POST, 'sp_date_from', null ) );
 		update_post_meta( $post_id, 'sp_date_to', sp_array_value( $_POST, 'sp_date_to', null ) );
 		update_post_meta( $post_id, 'sp_order', sp_array_value( $_POST, 'sp_order', array() ) );
-		update_post_meta( $post_id, 'sp_team', sp_array_value( $_POST, 'sp_team', 0 ) );
-		update_post_meta( $post_id, 'sp_table', sp_array_value( $_POST, 'sp_table', 0 ) );
+		sp_update_post_meta_recursive( $post_id, 'sp_team', sp_array_value( $_POST, 'sp_team', array() ) );
 	}
 }
\ No newline at end of file
diff --git a/includes/class-sp-calendar.php b/includes/class-sp-calendar.php
index 8c4e380b..153db653 100644
--- a/includes/class-sp-calendar.php
+++ b/includes/class-sp-calendar.php
@@ -103,7 +103,7 @@ class SP_Calendar extends SP_Custom_Post {
 				$leagues = get_the_terms( $this->ID, 'sp_league' );
 				$seasons = get_the_terms( $this->ID, 'sp_season' );
 				$venues = get_the_terms( $this->ID, 'sp_venue' );
-				$team = get_post_meta( $this->ID, 'sp_team', true );
+				$teams = get_post_meta( $this->ID, 'sp_team', false );
 				$table = get_post_meta( $this->ID, 'sp_table', true );
 
 				if ( $leagues ):
@@ -142,26 +142,14 @@ class SP_Calendar extends SP_Custom_Post {
 					);
 				endif;
 
-				if ( $team ):
-					if ( 'table' !== $team ):
-						$args['meta_query']	= array(
-							array(
-								'key' => 'sp_team',
-								'value' => $team,
-							),
-						);
-					elseif ( $table ) :
-						$teams = get_post_meta( $table, 'sp_team' );
-						$teams = array_filter( $teams );
-						
-						$args['meta_query']	= array(
-							array(
-								'key'		=> 'sp_team',
-								'value'		=> $teams,
-								'compare' 	=> 'IN'
-							),
-						);
-					endif;
+				if ( ! empty( $teams ) ):
+					$args['meta_query']	= array(
+						array(
+							'key' => 'sp_team',
+							'value' => $teams,
+							'compare' => 'IN',
+						),
+					);
 				endif;
 
 			endif;