Commit 54058c55 authored by Leigh B. Stoller's avatar Leigh B. Stoller

Change to ron/plab yes/no flags, as per Jay's request: "Prior to

project approval, the profile should display what they requested.
Anytime after project approval, the profile should display what access
they were granted."
parent 132e5851
......@@ -600,9 +600,6 @@ class Project
$proj_members = $this->num_members();
$proj_pcs = $this->num_pcs();
# These are now booleans, not actual counts.
$proj_ronpcs = YesNo(
strpos($this->pcremote_ok(), "pcron") !== false);
$proj_plabpcs = YesNo($this->num_pcplab());
$proj_linked = YesNo($this->linked_to_us());
$proj_why = nl2br($this->why());
$approved = YesNo($this->approved());
......@@ -612,6 +609,18 @@ class Project
$cvsrepo_public = $this->cvsrepo_public();
$allow_workbench = $this->allow_workbench();
# Before project approval, display ron/plab request status.
if ($approved) {
$proj_ronpcs =
YesNo(strpos($this->pcremote_ok(), "pcron") !== false);
$proj_plabpcs =
YesNo(strpos($this->pcremote_ok(), "pcplabphys") !== false);
}
else {
$proj_ronpcs = YesNo($this->num_ron());
$proj_plabpcs = YesNo($this->num_pcplab());
}
if (! ($head_user = User::Lookup($proj_head_idx))) {
TBERROR("Could not lookup object for user $proj_head_idx", 1);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment