forked from science-ation/science-ation
Whoops! the last commit was for this file - not the scheduler.. DOH
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:
parent
fefd9c8e35
commit
7076b17366
@ -169,6 +169,10 @@ function getProjectsNominatedForSpecialAward($award_id)
|
||||
{
|
||||
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
|
||||
projects.projectnumber,
|
||||
projects.title,
|
||||
@ -193,7 +197,14 @@ function getProjectsNominatedForSpecialAward($award_id)
|
||||
"title"=>$prjr->title
|
||||
);
|
||||
}
|
||||
//return the projects that have self-nominated themselves for the award
|
||||
return $projects;
|
||||
}
|
||||
else
|
||||
{
|
||||
//return the projects that are eligible for the award instead
|
||||
return getProjectsEligibleForAward($award_id);
|
||||
}
|
||||
}
|
||||
|
||||
function getSpecialAwardsNominatedByRegistrationID($id)
|
||||
|
Loading…
Reference in New Issue
Block a user