From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 30 May 2007 22:39:38 -0000
Subject: [Cluster-devel] conga/luci cluster/resource-form-macros site/l ...
Message-ID: <20070530223938.4412.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: 	EXPERIMENTAL
Changes by:	rmccabe at sourceware.org	2007-05-30 22:39:37

Modified files:
	luci/cluster   : resource-form-macros 
	luci/site/luci/var: Data.fs 

Log message:
	Bring the database into sync with the rest of the codebase

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&only_with_tag=EXPERIMENTAL&r1=1.37.2.1&r2=1.37.2.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/var/Data.fs.diff?cvsroot=cluster&only_with_tag=EXPERIMENTAL&r1=1.25.2.1&r2=1.25.2.2

--- conga/luci/cluster/resource-form-macros	2007/05/30 05:54:01	1.37.2.1
+++ conga/luci/cluster/resource-form-macros	2007/05/30 22:39:28	1.37.2.2
@@ -92,7 +92,7 @@
 	<h2>Resources Remove Form</h2>
 
 	<tal:block tal:define="
-		msg python: here.deleteResource(here.getRicciAgentForCluster(request), request)">
+		msg python: here.resourceDelete(here.getRicciAgentForCluster(request), request)">
 		<span class="error" tal:condition="msg" tal:content="msg" />
 	</tal:block>
 </div>
@@ -271,7 +271,7 @@
 	<h2>Resource <span tal:replace="python: ('edit' in request and request['edit']) and 'Edited' or 'Added'" /></h2>
 
 	<div tal:content="
-		python: here.addResource(here.getRicciAgentForCluster(request), request)" />
+		python: here.resourceAdd(here.getRicciAgentForCluster(request), request)" />
 </div>
 
 <div metal:define-macro="resourceconfig-form">
Binary files /cvs/cluster/conga/luci/site/luci/var/Data.fs	2007/05/18 03:30:44	1.25.2.1 and /cvs/cluster/conga/luci/site/luci/var/Data.fs	2007/05/30 22:39:28	1.25.2.2 differ
rcsdiff: /cvs/cluster/conga/luci/site/luci/var/Data.fs: diff failed