Author: jfthomps
Date: Thu Apr 26 19:25:01 2012
New Revision: 1331042
URL: http://svn.apache.org/viewvc?rev=1331042&view=rev
Log:
VCL-463
add ability to deploy images as servers
requests.php: modified AJeditRequest and AJsubmitEditRequest - fixed bug where
a user that has selected to only see user groups matching their own affiliation
cannot edit a server reservation if the admin or access user group is from a
different affiliation
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=1331042&r1=1331041&r2=1331042&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/requests.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/requests.php Thu Apr 26 19:25:01 2012
@@ -2131,6 +2131,12 @@ function AJeditRequest() {
}
else
$h .= "<select id=\"admingrpsel\">";
+ if(! empty($request['admingroupid']) &&
+ ! array_key_exists($request['admingroupid'], $groups)) {
+ $id = $request['admingroupid'];
+ $name = getUserGroupName($request['admingroupid'], 1);
+ $h .= "<option value=\"$id\">$name</option>\n";
+ }
$h .= "<option value=\"0\">" . _("None") . "</option>\n";
foreach($groups as $id => $group) {
if($id == $request['admingroupid'])
@@ -2146,6 +2152,12 @@ function AJeditRequest() {
}
else
$h .= "<select id=\"logingrpsel\">";
+ if(! empty($request['logingroupid']) &&
+ ! array_key_exists($request['logingroupid'], $groups)) {
+ $id = $request['logingroupid'];
+ $name = getUserGroupName($request['logingroupid'], 1);
+ $h .= "<option value=\"$id\">$name</option>\n";
+ }
$h .= "<option value=\"0\">None</option>\n";
foreach($groups as $id => $group) {
if($id == $request['logingroupid'])
@@ -2590,13 +2602,17 @@ function AJsubmitEditRequest() {
$updateservername = 0;
if($request['serverrequest']) {
if($user['showallgroups'])
- $groups = getUserGroups(1);
+ $groups = getUserGroups(0);
else
- $groups = getUserGroups(1, $user['affiliationid']);
+ $groups = getUserGroups(0, $user['affiliationid']);
$admingroupid = processInputVar('admingroupid', ARG_NUMERIC);
$logingroupid = processInputVar('logingroupid', ARG_NUMERIC);
- if(($admingroupid != 0 && ! array_key_exists($admingroupid,
$groups)) ||
- ($logingroupid != 0 && !
array_key_exists($logingroupid, $groups))) {
+ if(($admingroupid != 0 &&
+ ! array_key_exists($admingroupid, $groups) &&
+ $admingroupid != $request['admingroupid']) ||
+ ($logingroupid != 0 &&
+ ! array_key_exists($logingroupid, $groups) &&
+ $logingroupid != $request['logingroupid'])) {
$cdata = getContinuationVar();
$cont = addContinuationsEntry('AJsubmitEditRequest',
$cdata, SECINDAY, 1, 0);
sendJSON(array('status' => 'error',
