You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vcl.apache.org by jf...@apache.org on 2011/06/16 22:24:58 UTC

svn commit: r1136653 - /incubator/vcl/trunk/web/.ht-inc/privileges.php

Author: jfthomps
Date: Thu Jun 16 20:24:58 2011
New Revision: 1136653

URL: http://svn.apache.org/viewvc?rev=1136653&view=rev
Log:
VCL-463

modified jsonGetResourceGroupMembers - if $type == serverprofile, set $field to 'name'

Modified:
    incubator/vcl/trunk/web/.ht-inc/privileges.php

Modified: incubator/vcl/trunk/web/.ht-inc/privileges.php
URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/web/.ht-inc/privileges.php?rev=1136653&r1=1136652&r2=1136653&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/privileges.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/privileges.php Thu Jun 16 20:24:58 2011
@@ -54,7 +54,7 @@ function viewNodes() {
 	# tree
 	if($hasManagePerms) {
 		print "<div id=\"mainTabContainer\" dojoType=\"dijit.layout.TabContainer\"\n";
-		print "     style=\"width:800px;height:600px\">\n";
+		print "     style=\"width:750px;height:600px\">\n";
 		print "<div id=\"privtreetab\" dojoType=\"dijit.layout.ContentPane\" title=\"Privilege Tree\">\n";
 	}
 	print "<H2>Privilege Tree</H2>\n";
@@ -1185,6 +1185,7 @@ function userLookup() {
 		if(! mysql_num_rows($qh))
 			print "<font color=red>$userid not currently found in VCL user database, will try to add...</font><br>\n";
 		elseif($force) {
+			$_SESSION['userresources'] = array();
 			$row = mysql_fetch_assoc($qh);
 			$newtime = unixToDatetime(time() - SECINDAY - 5);
 			$query = "UPDATE user SET lastupdated = '$newtime' WHERE id = {$row['id']}";
@@ -1898,6 +1899,8 @@ function jsonGetResourceGroupMembers() {
 			$field = 'prettyname';
 		elseif($type == 'schedule')
 			$field = 'name';
+		elseif($type == 'serverprofile')
+			$field = 'name';
 		$query = "SELECT t.$field AS item "
 		       . "FROM $type t, "
 		       .      "resource r, "