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

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

[jparsons]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	jparsons at sourceware.org	2006-07-25 00:52:52

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

Log message:
	Preset cluster list in getTabs

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

--- conga/luci/site/luci/Extensions/storage_adapters.py	2006/05/30 20:17:21	1.1
+++ conga/luci/site/luci/Extensions/storage_adapters.py	2006/07/25 00:52:52	1.2
@@ -356,7 +356,7 @@
 
   ctab = { 'Title':"cluster",
            'Description':"Cluster configuration page", 
-           'Taburl':"../cluster"}
+           'Taburl':"../cluster?pagetype=3"}
   if selectedtab == "cluster":
     ctab['isSelected'] = True
   else:

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

[rmccabe]

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

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

Log message:
	nix duplicated code

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

--- conga/luci/site/luci/Extensions/storage_adapters.py	2006/10/16 04:51:32	1.7
+++ conga/luci/site/luci/Extensions/storage_adapters.py	2006/10/18 19:10:48	1.8
@@ -370,50 +370,3 @@
   url += '&' + STONAME + '=' + hostname
   return url
 
-
-def getTabs(self, req):
-  ###XXX Make this method return only tabs current user can use
-  portaltabs = list()
-  selectedtab = "homebase"
-  try:
-    baseurl = req['URL']
-    if baseurl.find("cluster") > (-1):
-      selectedtab = "cluster"
-    elif baseurl.find("storage") > (-1):
-      selectedtab = "storage"
-    else:
-      selectedtab = "homebase"
-  except KeyError, e:
-    pass
-
-  htab = { 'Title':"homebase",
-           'Description':"Home base for this luci server", 
-           'Taburl':"../homebase"}
-  if selectedtab == "homebase":
-    htab['isSelected'] = True
-  else:
-    htab['isSelected'] = False
-      
-
-  ctab = { 'Title':"cluster",
-           'Description':"Cluster configuration page", 
-           'Taburl':"../cluster?pagetype=3"}
-  if selectedtab == "cluster":
-    ctab['isSelected'] = True
-  else:
-    ctab['isSelected'] = False
-
-  stab = { 'Title':"storage",
-           'Description':"Storage configuration page", 
-           'Taburl':"../storage"}
-  if selectedtab == "storage":
-    stab['isSelected'] = True
-  else:
-    stab['isSelected'] = False
-
-  portaltabs.append(htab) 
-  portaltabs.append(ctab) 
-  portaltabs.append(stab) 
-
-  return portaltabs
-