From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 14 Mar 2007 22:38:09 -0000
Subject: [Cluster-devel] conga/luci cluster/form-macros site/luci/Exten ...
Message-ID: <20070314223809.26175.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: 	RHEL4
Changes by:	rmccabe at sourceware.org	2007-03-14 22:38:08

Modified files:
	luci/cluster   : form-macros 
	luci/site/luci/Extensions: NFSClient.py 

Log message:
	Fix NFS resource bugs

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.176.2.16&r2=1.176.2.17
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/NFSClient.py.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.1&r2=1.1.4.1

--- conga/luci/cluster/form-macros	2007/03/12 04:24:33	1.176.2.16
+++ conga/luci/cluster/form-macros	2007/03/14 22:38:08	1.176.2.17
@@ -4304,15 +4304,15 @@
 		<div metal:use-macro="here/resource-form-macros/macros/gfs_macro" />
 	</tal:block>
 
-	<tal:block tal:condition="python: type == 'nfsm'">
+	<tal:block tal:condition="python: type == 'netfs'">
 		<div metal:use-macro="here/resource-form-macros/macros/nfsm_macro"/>
 	</tal:block>
 
-	<tal:block tal:condition="python: type == 'nfsx'">
+	<tal:block tal:condition="python: type == 'nfsexport'">
 		<div metal:use-macro="here/resource-form-macros/macros/nfsx_macro"/>
 	</tal:block>
 
-	<tal:block tal:condition="python: type == 'nfsc'">
+	<tal:block tal:condition="python: type == 'nfsclient'">
 		<div metal:use-macro="here/resource-form-macros/macros/nfsc_macro"/>
 	</tal:block>
 
--- conga/luci/site/luci/Extensions/NFSClient.py	2006/05/30 20:17:21	1.1
+++ conga/luci/site/luci/Extensions/NFSClient.py	2007/03/14 22:38:08	1.1.4.1
@@ -5,7 +5,7 @@
 import gettext
 _ = gettext.gettext
 
-RESOURCE_TYPE=_("NFS Client: ")
+RESOURCE_TYPE=_("NFS Client")
 TAG_NAME = "nfsclient"
 DENY_ALL_CHILDREN = True