[Cluster-devel] conga/luci/site/luci/Extensions cluster_adapte ...

[rmccabe at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2006-10-18 19:16:17

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

Log message:
	fixes for bz#211345 and bz#211104. will backport to the RHEL5 branch when/if approved.

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

--- conga/luci/site/luci/Extensions/cluster_adapters.py	2006/10/16 21:01:25	1.120
+++ conga/luci/site/luci/Extensions/cluster_adapters.py	2006/10/18 19:16:17	1.121
@@ -16,12 +16,13 @@
 from NFSClient import NFSClient
 from NFSExport import NFSExport
 from Netfs import Netfs
+from Xenvm import Xenvm
 from Script import Script
 from Samba import Samba
 from clusterOS import resolveOSType
 from GeneralError import GeneralError
 from UnknownClusterError import UnknownClusterError
-from homebase_adapters import nodeUnauth, nodeAuth, manageCluster, createClusterSystems, havePermCreateCluster, setNodeFlag, delNodeFlag
+from homebase_adapters import nodeUnauth, nodeAuth, manageCluster, createClusterSystems, havePermCreateCluster, setNodeFlag, delNodeFlag, userAuthenticated
 
 #Policy for showing the cluster chooser menu:
 #1) If there are no clusters in the ManagedClusterSystems
@@ -1225,6 +1226,8 @@
 def getTabs(self, req):
   ###XXX Make this method return only tabs current user can use
   portaltabs = list()
+  if userAuthenticated(self):
+    return portaltabs
   selectedtab = "homebase"
   try:
     baseurl = req['URL']