From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 12 Mar 2007 05:46:07 -0000
Subject: [Cluster-devel] conga/luci/site/luci/Extensions cluster_adapte ...
Message-ID: <20070312054607.20505.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
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2007-03-12 05:46:07

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

Log message:
	Fix the navigation portal so the correct item is highlighted when adding and editing virtual services.

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

--- conga/luci/site/luci/Extensions/cluster_adapters.py	2007/03/12 04:22:26	1.120.2.24
+++ conga/luci/site/luci/Extensions/cluster_adapters.py	2007/03/12 05:46:07	1.120.2.25
@@ -2684,11 +2684,11 @@
   sv['cfg_type'] = "services"
   sv['absolute_url'] = url + "?pagetype=" + SERVICES + "&clustername=" + cluname
   sv['Description'] = "Service configuration for this cluster"
-  if pagetype == SERVICES or pagetype == SERVICE_CONFIG or pagetype == SERVICE_ADD or pagetype == SERVICE:
+  if pagetype == SERVICES or pagetype == SERVICE_CONFIG or pagetype == SERVICE_ADD or pagetype == SERVICE or pagetype == SERVICE_LIST or pagetype == VM_ADD or pagetype == VM_CONFIG:
     sv['show_children'] = True
   else:
     sv['show_children'] = False
-  if pagetype == SERVICES:
+  if pagetype == SERVICES or pagetype == SERVICE_LIST:
     sv['currentItem'] = True
   else:
     sv['currentItem'] = False
@@ -2719,11 +2719,11 @@
   svcfg['cfg_type'] = "servicecfg"
   svcfg['absolute_url'] = url + "?pagetype=" + SERVICE_CONFIG + "&clustername=" + cluname
   svcfg['Description'] = "Configure a Service for this cluster"
-  if pagetype == SERVICE_CONFIG or pagetype == SERVICE:
+  if pagetype == SERVICE_CONFIG or pagetype == SERVICE or pagetype == VM_CONFIG:
     svcfg['show_children'] = True
   else:
     svcfg['show_children'] = False
-  if pagetype == SERVICE_CONFIG:
+  if pagetype == SERVICE_CONFIG or pagetype == VM_CONFIG:
     svcfg['currentItem'] = True
   else:
     svcfg['currentItem'] = False