From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 30 Oct 2006 22:52:01 -0000
Subject: [Cluster-devel] conga/luci/site/luci/Extensions cluster_adapte ...
Message-ID: <20061030225201.28341.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2006-10-30 22:52:00

Modified files:
	luci/site/luci/Extensions: cluster_adapters.py 

Log message:
	jim's fix for bz 213057

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&r1=1.132&r2=1.133

--- conga/luci/site/luci/Extensions/cluster_adapters.py	2006/10/27 18:24:05	1.132
+++ conga/luci/site/luci/Extensions/cluster_adapters.py	2006/10/30 22:52:00	1.133
@@ -744,9 +744,9 @@
   if request.REQUEST_METHOD == 'POST':
     ret = validatePost(self, request)
     try:
-		request.SESSION.set('checkRet', ret[1])
+      request.SESSION.set('checkRet', ret[1])
     except:
-		request.SESSION.set('checkRet', {})
+      request.SESSION.set('checkRet', {})
   else:
     try: request.SESSION.set('checkRet', {})
     except: pass
@@ -780,8 +780,8 @@
   else:
     cldata['currentItem'] = False
 
-
-  if havePermCreateCluster(self):
+  UserHasPerms = havePermCreateCluster(self)
+  if UserHasPerms:
     cladd = {}
     cladd['Title'] = "Create a New Cluster"
     cladd['cfg_type'] = "clusteradd"
@@ -832,7 +832,8 @@
 
   mylist = list()
   mylist.append(cldata)
-  mylist.append(cladd)
+  if UserHasPerms:
+    mylist.append(cladd)
   mylist.append(clcfg)
   dummynode['children'] = mylist