Author: jfthomps
Date: Tue Apr 6 17:02:11 2010
New Revision: 931225
URL: http://svn.apache.org/viewvc?rev=931225&view=rev
Log:
VCL-295
modified AJupdateWaitTime to have an extra check of the length to make sure it
allows 12 hours for imaging reservations
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=931225&r1=931224&r2=931225&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/requests.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/requests.php Tue Apr 6 17:02:11 2010
@@ -195,8 +195,12 @@ function AJupdateWaitTime() {
# proccess length
$length = processInputVar('length', ARG_NUMERIC);
$times = getUserMaxTimes();
- if(empty($length) || $length > $times['initial'])
+ $imaging = getContinuationVar('imaging');
+ if(empty($length) ||
+ ($length > $times['initial'] && ! $imaging ) ||
+ ($length > $times['initial'] && $imaging && $length > 720)) {
return;
+ }
# process imageid
$imageid = processInputVar('imageid', ARG_NUMERIC);
$resources = getUserResources(array("imageAdmin", "imageCheckOut"));
@@ -204,7 +208,6 @@ function AJupdateWaitTime() {
if(! in_array($imageid, $validImageids))
return;
- $imaging = getContinuationVar('imaging');
$desconly = processInputVar('desconly', ARG_NUMERIC, 1);
$imagenotes = getImageNotes($imageid);
@@ -4512,5 +4515,4 @@ function getBlockRequestStatus($id) {
else
return NULL;
}
-
?>
