forked from science-ation/science-ation
Modify fix in r1448 to select project state based on the config variable for it
This commit is contained in:
parent
b37f0ef9cc
commit
2328f54721
@ -209,9 +209,8 @@ if( ($action=="edit" || $action=="assign" ) && $edit)
|
|||||||
projects,
|
projects,
|
||||||
registrations
|
registrations
|
||||||
WHERE
|
WHERE
|
||||||
projectnumber is not null AND
|
projectnumber is not null
|
||||||
(registrations.status='complete' OR
|
" . getJudgingEligibilityCode(). " AND
|
||||||
registrations.status='paymentpending' ) AND
|
|
||||||
projects.registrations_id=registrations.id AND
|
projects.registrations_id=registrations.id AND
|
||||||
projects.year='".$config['FAIRYEAR']."'
|
projects.year='".$config['FAIRYEAR']."'
|
||||||
ORDER BY
|
ORDER BY
|
||||||
@ -229,9 +228,8 @@ if( ($action=="edit" || $action=="assign" ) && $edit)
|
|||||||
LEFT JOIN judges_teams_timeslots_projects_link ON projects.id = judges_teams_timeslots_projects_link.projects_id,
|
LEFT JOIN judges_teams_timeslots_projects_link ON projects.id = judges_teams_timeslots_projects_link.projects_id,
|
||||||
registrations
|
registrations
|
||||||
WHERE
|
WHERE
|
||||||
projectnumber is not null AND
|
projectnumber is not null
|
||||||
(registrations.status='complete' OR
|
" . getJudgingEligibilityCode(). " AND
|
||||||
registrations.status='paymentpending' ) AND
|
|
||||||
projects.registrations_id=registrations.id AND
|
projects.registrations_id=registrations.id AND
|
||||||
judges_teams_timeslots_projects_link.projects_id IS NULL AND
|
judges_teams_timeslots_projects_link.projects_id IS NULL AND
|
||||||
projects.year='".$config['FAIRYEAR']."'
|
projects.year='".$config['FAIRYEAR']."'
|
||||||
|
Loading…
Reference in New Issue
Block a user