Author: jfthomps
Date: Wed Sep 24 18:07:07 2014
New Revision: 1627381
URL: http://svn.apache.org/r1627381
Log:
VCL-237 - improve wording in error message about extending a reservation to
overlap with a concurrently limited image
requests.php: modified AJsubmitEditRequest: updated wording for editing
reservations that would cause a concurrent reservation problem
Modified:
vcl/trunk/web/.ht-inc/requests.php
Modified: vcl/trunk/web/.ht-inc/requests.php
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/requests.php?rev=1627381&r1=1627380&r2=1627381&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/requests.php (original)
+++ vcl/trunk/web/.ht-inc/requests.php Wed Sep 24 18:07:07 2014
@@ -3590,10 +3590,11 @@ function AJsubmitEditRequest() {
return;
}
elseif($rc == -1) {
- $h .= _("You have requested an environment that is limited in
the<br>");
- $h .= _("number of concurrent reservations that can be made. No
further<br>");
- $h .= _("reservations for the environment can be made for the
time you<br>");
- $h .= _("have selected. Please select another time for the
reservation.<br><br>");
+ $h .= _("The reservation you are modifying is for an
environment limited<br>");
+ $h .= _("in the number of concurrent reservations that can be
made.<br>");
+ $h .= _("The time or duration you have requested overlaps with
too<br>");
+ $h .= _("many other reservations for the same image. Please
select<br>");
+ $h .= _("another time or duration for the
reservation.<br><br>");
$cdata = getContinuationVar();
$cont = addContinuationsEntry('AJsubmitEditRequest', $cdata,
SECINDAY, 1, 0);
$data['status'] = 'conflict';
