Author: jfthomps
Date: Wed Apr 8 20:17:04 2015
New Revision: 1672161
URL: http://svn.apache.org/r1672161
Log:
VCL-857 - admin access not granted if owner of server reservation in access
user group
requests.php:
-modified newReservationHTML: added div with text explaining that the admin
user group does not grant admin access within images where root access is
disabled
-modified AJupdateWaitTime: show or hide note added to newReservationHTML based
on root access setting
-modified AJeditRequest: added div with text explaining that the admin user
group does not grant admin access within images where root access is disabled;
added divs and css styling to make is show up nicely
vcl.po files:
-added string from changes made in requests.php
Modified:
vcl/trunk/web/.ht-inc/requests.php
vcl/trunk/web/locale/po_files/es_MX/vcl.po
vcl/trunk/web/locale/po_files/fr_CA/vcl.po
vcl/trunk/web/locale/po_files/vcl.po.template
Modified: vcl/trunk/web/.ht-inc/requests.php
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/requests.php?rev=1672161&r1=1672160&r2=1672161&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/requests.php (original)
+++ vcl/trunk/web/.ht-inc/requests.php Wed Apr 8 20:17:04 2015
@@ -1515,6 +1515,11 @@ function newReservationHTML() {
}
$h .= "</select></span><br>\n";
+ $h .= "<div id=\"admingrpnote\" class=\"hidden\" ";
+ $h .= "style=\"width: 400px; margin: 3px 0 3px 10.5em; padding: 1px;
border: 1px solid;\">";
+ $h .= _("Administrative access has been disabled for this image. Users
in the Admin User Group will have control of the reservaion on the Reservations
page but will not have administrative access within the reservation.");
+ $h .= "</div>\n";
+
# login group
$logingroups = $admingroups;
$h .= "<label for=\"deploylogingroup\">";
@@ -1861,6 +1866,11 @@ function AJupdateWaitTime() {
}
}*/
+ if($images[$imageid]['rootaccess'])
+ print "dojo.addClass('admingrpnote', 'hidden');";
+ else
+ print "dojo.removeClass('admingrpnote', 'hidden');";
+
# check for exceeding max overlaps
$max = getMaxOverlap($user['id']);
if(checkOverlap($start, $end, $max)) {
@@ -3027,7 +3037,11 @@ function AJeditRequest() {
$groups = getUserGroups();
else
$groups = getUserGroups(0, $user['affiliationid']);
+ $h .= "<div style=\"display: table-row;\">\n";
+ $h .= "<div style=\"display: table-cell;\">\n";
$h .= _("Admin User Group") . ": ";
+ $h .= "</div>\n";
+ $h .= "<div style=\"display: table-cell;\">\n";
$disabled = '';
if($request['stateid'] == 14 && $request['laststateid'] == 24)
$disabled = "disabled=\"true\"";
@@ -3051,6 +3065,16 @@ function AJeditRequest() {
$h .= "<option
value=\"$id\">{$group['name']}</option>";
}
$h .= "</select><br>";
+
+ $imageinfo = getImages(0,
$request['reservations'][0]['imageid']);
+
if($imageinfo[$request['reservations'][0]['imageid']]['rootaccess'] == 0) {
+ $h .= "<div style=\"width: 240px; margin: 3px 0 3px 0;
padding: 1px; border: 1px solid;\">";
+ $h .= _("Administrative access has been disabled for
this image. Users in the Admin User Group will have control of the reservaion
on the Reservations page but will not have administrative access within the
reservation.");
+ $h .= "</div>\n";
+ }
+ $h .= "</div>\n";
+ $h .= "</div>\n";
+
$h .= _("Access User Group") . ": ";
if(USEFILTERINGSELECT && count($groups) <
FILTERINGSELECTTHRESHOLD) {
$h .= "<select dojoType=\"dijit.form.FilteringSelect\"
id=\"logingrpsel\" ";
Modified: vcl/trunk/web/locale/po_files/es_MX/vcl.po
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/locale/po_files/es_MX/vcl.po?rev=1672161&r1=1672160&r2=1672161&view=diff
==============================================================================
--- vcl/trunk/web/locale/po_files/es_MX/vcl.po (original)
+++ vcl/trunk/web/locale/po_files/es_MX/vcl.po Wed Apr 8 20:17:04 2015
@@ -1554,6 +1554,10 @@ msgid ""
"%s is now in the process of being updated to use the newly created revision."
msgstr ""
+#: ../.ht-inc/requests.php
+msgid "Administrative access has been disabled for this image. Users in the
Admin User Group will have control of the reservaion on the Reservations page
but will not have administrative access within the reservation."
+msgstr ""
+
#: ../.ht-inc/userpreferences.php:61
msgid "User preferences successfully updated"
msgstr "Han sido actualizadas las preferencias del usuario"
Modified: vcl/trunk/web/locale/po_files/fr_CA/vcl.po
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/locale/po_files/fr_CA/vcl.po?rev=1672161&r1=1672160&r2=1672161&view=diff
==============================================================================
--- vcl/trunk/web/locale/po_files/fr_CA/vcl.po (original)
+++ vcl/trunk/web/locale/po_files/fr_CA/vcl.po Wed Apr 8 20:17:04 2015
@@ -1348,6 +1348,10 @@ msgstr "Assurez-production"
msgid "%s is now in the process of being updated to use the newly created
revision."
msgstr "%s est maintenant dans le processus de mise à jour afin d'utiliser la
révision nouvellement créé."
+#: ../.ht-inc/requests.php:4848
+msgid "Administrative access has been disabled for this image. Users in the
Admin User Group will have control of the reservaion on the Reservations page
but will not have administrative access within the reservation."
+msgstr "Accès administratif a été désactivé pour cette image. Les
utilisateurs du groupe d'utilisateur admin auront le contrôle de la reservaion
sur la page de réservation, mais ne auront pas accès administratif au sein de
la réserve."
+
#: ../.ht-inc/userpreferences.php:61
msgid "User preferences successfully updated"
msgstr "les préférences de l'utilisateur mis à jour avec succès"
@@ -2116,7 +2120,7 @@ msgstr "Les données non-numérique
#: ../.ht-inc/image.php:1399
msgid "Invalid infomation in database. Contact your system administrator."
-msgstr "Infomation non valide dans la base de données. Contactez votre
administrateur système."
+msgstr "Infomation non valide dans la base de données. Contactez votre
administrateur système."
#: ../.ht-inc/image.php:1535
msgid "Name must be from 2 to 60 characters and cannot contain any dashes (-),
single (') or double (\") quotes."
Modified: vcl/trunk/web/locale/po_files/vcl.po.template
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/locale/po_files/vcl.po.template?rev=1672161&r1=1672160&r2=1672161&view=diff
==============================================================================
--- vcl/trunk/web/locale/po_files/vcl.po.template (original)
+++ vcl/trunk/web/locale/po_files/vcl.po.template Wed Apr 8 20:17:04 2015
@@ -1348,6 +1348,10 @@ msgstr ""
msgid "%s is now in the process of being updated to use the newly created
revision."
msgstr ""
+#: ../.ht-inc/requests.php
+msgid "Administrative access has been disabled for this image. Users in the
Admin User Group will have control of the reservaion on the Reservations page
but will not have administrative access within the reservation."
+msgstr ""
+
#: ../.ht-inc/userpreferences.php:61
msgid "User preferences successfully updated"
msgstr ""
