From 335098e5a7821bc9662d83dd89ebacafeb2667cb Mon Sep 17 00:00:00 2001
From: james <james>
Date: Tue, 3 Jan 2006 02:01:20 +0000
Subject: [PATCH] Fix a few queries to handle multi-year data properly Add link
 to edit the generic prize template

---
 admin/award_awards.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/admin/award_awards.php b/admin/award_awards.php
index a8b2724a..56ad7327 100644
--- a/admin/award_awards.php
+++ b/admin/award_awards.php
@@ -228,7 +228,7 @@ echo mysql_error();
 
 			echo "<tr><td>".i18n("Presenter")."</td><td><input type=\"text\" name=\"presenter\" value=\"".htmlspecialchars($award_awards_presenter)."\" size=\"50\" maxlength=\"128\" /></td></tr>\n";
 			echo "<tr><td>".i18n("Type")."</td><td>";
-			$tq=mysql_query("SELECT id,type FROM award_types ORDER BY type");
+			$tq=mysql_query("SELECT id,type FROM award_types WHERE year='{$config['FAIRYEAR']}' ORDER BY type");
 			echo "<select name=\"award_types_id\">";
 			//only show the "choose a type" option if we are adding,if we are editing, then they must have already chosen one.
 			echo $firsttype;
@@ -319,7 +319,7 @@ echo mysql_error();
 			echo "</select>";
 			echo "</td><td>";
 
-			$q=mysql_query("SELECT id,type FROM award_types ORDER BY type");
+			$q=mysql_query("SELECT id,type FROM award_types WHERE year='{$config['FAIRYEAR']}' ORDER BY type");
 			echo "<select name=\"award_types_id\" onchange=\"document.forms.filterchange.submit()\">";
 			echo "<option value=\"\">".i18n("All Award Types")."</option>";
 			while($r=mysql_fetch_object($q))
@@ -366,6 +366,7 @@ echo mysql_error();
 							$where_ati
 						AND 	award_awards.award_sponsors_id=award_sponsors.id
 						AND	award_awards.award_types_id=award_types.id
+						AND 	award_types.year='".$config['FAIRYEAR']."'
 					ORDER BY `$orderby`");
 
 			echo mysql_error();
@@ -417,6 +418,9 @@ echo mysql_error();
 				echo "<input type=\"submit\" value=\"".i18n("Re-order awards")."\" />";
 				echo "</form>";
 			}
+			echo "<br />";
+			echo "<a href=\"award_prizes.php?award_awards_id=-1\">Edit prizes for the generic prize template</a>";
+
 		}
 
 	send_footer();