arman/science-ation
1
1
Fork 0
forked from science-ation/science-ation
Code Pull Requests Activity

Whoops! the last commit was for this file - not the scheduler.. DOH

Browse Source 
BUGFIX From Just Reardon:
If specialawardnomination is set to "none" (fair doesnt use special award self-nominations) then the pick winners page will instead show all projects that are eligible for the award to choose a winner, instead of those that are nominated for it (which is none).
This commit is contained in:
james 2006-01-26 15:06:56 +00:00
parent fefd9c8e35
commit 7076b17366
1 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
projects.inc.php
View File

@ -169,6 +169,10 @@ function getProjectsNominatedForSpecialAward($award_id)
{ {
global $config; global $config;
//if they dont use special award nominations, then we will instead get all of the projects that
//are eligible for the award, instead of nominated for it.
if($config['specialawardnomination']!="none")
{
$prjq=mysql_query("SELECT $prjq=mysql_query("SELECT
projects.projectnumber, projects.projectnumber,
projects.title, projects.title,
@ -193,7 +197,14 @@ function getProjectsNominatedForSpecialAward($award_id)
"title"=>$prjr->title "title"=>$prjr->title
); );
} }
//return the projects that have self-nominated themselves for the award
return $projects; return $projects;
}
else
{
//return the projects that are eligible for the award instead
return getProjectsEligibleForAward($award_id);
}
} }
function getSpecialAwardsNominatedByRegistrationID($id) function getSpecialAwardsNominatedByRegistrationID($id)