Author: jfthomps
Date: Tue Mar 3 15:30:53 2015
New Revision: 1663724
URL: http://svn.apache.org/r1663724
Log:
when editing images, changed to allow 1 for max concurrent usage
image.php: modified validateResourceData: updated text of error message for
concurrent to specify between 0 and 255
image.js: modified saveResource: updated conditional and error message for
concurrent to allow 0 to 255 and specify that
messages.js and messages.js.template: updated error message for max concurrent
usage to match update in image.js
Modified:
vcl/trunk/web/.ht-inc/image.php
vcl/trunk/web/js/nls/es_MX/messages.js
vcl/trunk/web/js/nls/messages.js.template
vcl/trunk/web/js/resources/image.js
Modified: vcl/trunk/web/.ht-inc/image.php
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/image.php?rev=1663724&r1=1663723&r2=1663724&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/image.php (original)
+++ vcl/trunk/web/.ht-inc/image.php Tue Mar 3 15:30:53 2015
@@ -1568,7 +1568,7 @@ class Image extends Resource {
if((! is_numeric($return['concurrent']) && !
empty($return['concurrent'])) ||
(is_numeric($return['concurrent']) &&
($return["concurrent"] < 0 || $return["concurrent"] > 255))) {
$return['error'] = 1;
- $errormsg[] = _("Max concurrent usage must be 0 or
between 2 and 255");
+ $errormsg[] = _("Max concurrent usage must be between 0
and 255");
}
if($return['mode'] == 'edit' &&
($return["reload"] < 0 || $return["reload"] > 120)) {
Modified: vcl/trunk/web/js/nls/es_MX/messages.js
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/js/nls/es_MX/messages.js?rev=1663724&r1=1663723&r2=1663724&view=diff
==============================================================================
--- vcl/trunk/web/js/nls/es_MX/messages.js (original)
+++ vcl/trunk/web/js/nls/es_MX/messages.js Tue Mar 3 15:30:53 2015
@@ -62,7 +62,7 @@ nlsmessages = {
'Save Changes':'',
'Access denied to edit this item':'',
'Invalid network speed specified':'',
-'Max Concurrent Usage must be 0 or from 2 to 255':'',
+'Max Concurrent Usage must be between 0 and 255':'',
'Invalid value specified for \'Available for checkout\'':'',
'Invalid value specified for \'Check for logged in user\'':'',
'Invalid value specified for \'Users have administrative access\'':'',
Modified: vcl/trunk/web/js/nls/messages.js.template
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/js/nls/messages.js.template?rev=1663724&r1=1663723&r2=1663724&view=diff
==============================================================================
--- vcl/trunk/web/js/nls/messages.js.template (original)
+++ vcl/trunk/web/js/nls/messages.js.template Tue Mar 3 15:30:53 2015
@@ -62,7 +62,7 @@ nlsmessages = {
'Save Changes':'',
'Access denied to edit this item':'',
'Invalid network speed specified':'',
-'Max Concurrent Usage must be 0 or from 2 to 255':'',
+'Max Concurrent Usage must be between 0 and 255':'',
'Invalid value specified for \'Available for checkout\'':'',
'Invalid value specified for \'Check for logged in user\'':'',
'Invalid value specified for \'Users have administrative access\'':'',
Modified: vcl/trunk/web/js/resources/image.js
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/js/resources/image.js?rev=1663724&r1=1663723&r2=1663724&view=diff
==============================================================================
--- vcl/trunk/web/js/resources/image.js (original)
+++ vcl/trunk/web/js/resources/image.js Tue Mar 3 15:30:53 2015
@@ -176,8 +176,8 @@ function saveResource() {
return;
}
data['concurrent'] = dijit.byId('concurrent').get('value');
- if(data['concurrent'] < 0 || data['concurrent'] == 1 ||
data['concurrent'] > 255) {
- errobj.innerHTML = _('Max Concurrent Usage must be 0 or from 2
to 255');
+ if(data['concurrent'] < 0 || data['concurrent'] > 255) {
+ errobj.innerHTML = _('Max Concurrent Usage must be between 0
and 255');
return;
}
data['checkout'] = parseInt(dijit.byId('checkout').get('value'));
