Author: jfthomps
Date: Fri Mar 13 20:17:01 2009
New Revision: 753377
URL: http://svn.apache.org/viewvc?rev=753377&view=rev
Log:
VCL-91
this was really already coded, but was not working right because of the bug in
getUserRequests mentioned in revision 753339
modified editRequest to call printEditNewUpdate using $reservation instead of
$res
moved check to not allow saving/updating reservation for imaging reservations
when editing a reservation from editRequest to printEditNewUpdate
Modified:
incubator/vcl/trunk/web/.ht-inc/requests.php
Modified: incubator/vcl/trunk/web/.ht-inc/requests.php
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/web/.ht-inc/requests.php?rev=753377&r1=753376&r2=753377&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/requests.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/requests.php Fri Mar 13 20:17:01 2009
@@ -2415,7 +2415,7 @@
print "has a total length of " .
minToHourMin($maxtimes["total"]);
print ". This reservation already meets that length.
Therefore, ";
print "you are not allowed to extend your reservation
any further.<br><br>\n";
- printEditNewUpdate($request, $res);
+ printEditNewUpdate($request, $reservation);
return;
}
//if have time left to extend it, create an array of lengths
based on maxextend that has a cap
@@ -2519,10 +2519,7 @@
print " </TR>\n";
print "</table>\n";
- if($request['forimaging'])
- return;
-
- printEditNewUpdate($request, $res);
+ printEditNewUpdate($request, $reservation);
}
////////////////////////////////////////////////////////////////////////////////
@@ -2542,6 +2539,10 @@
if(count($request['reservations']) > 1)
return;
+ # if already an imaging reservation, don't display update info here
+ if($request['forimaging'])
+ return;
+
$resources = getUserResources(array("imageAdmin"));
if(! array_key_exists($res['imageid'], $resources['image']))
return;
