[Cluster-devel] conga ./conga.spec.in.in luci/cluster/cluster_ ...

[rmccabe@sourceware.org <rmccabe@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2008-02-27 20:22:49

Modified files:
	.              : conga.spec.in.in 
	luci/cluster   : cluster_svc-macros 
	luci/site/luci/Extensions: LuciZopeAsync.py 
	luci/site/luci/var: Data.fs 
	make           : version.in 

Log message:
	Fix 434586

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.69&r2=1.45.2.70
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/cluster_svc-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.3.2.2&r2=1.3.2.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/LuciZopeAsync.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.2.5&r2=1.1.2.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/var/Data.fs.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.15.2.29&r2=1.15.2.30
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.21.2.34&r2=1.21.2.35

--- conga/conga.spec.in.in	2008/02/12 17:40:38	1.45.2.69
+++ conga/conga.spec.in.in	2008/02/27 20:22:18	1.45.2.70
@@ -292,6 +292,9 @@
 
 ###  changelog ###
 %changelog
+* Wed Feb 27 2008 Ryan McCabe <rmccabe@redhat.com> 0.12.0-6
+- Fix bz434586 (Resource tree does not display multiple children of a parent correctly)
+
 * Tue Feb 12 2008 Ryan McCabe <rmccabe@redhat.com> 0.12.0-5
 - Fix bz432533 (Do not attempt to install the cmirror package when shared storage is requested)
 
--- conga/luci/cluster/cluster_svc-macros	2008/02/08 21:56:33	1.3.2.2
+++ conga/luci/cluster/cluster_svc-macros	2008/02/27 20:22:19	1.3.2.3
@@ -756,7 +756,7 @@
 
 		<tal:block
 			tal:condition="python: 'max_depth' in res and res['max_depth'] > 0"
-			tal:replace="structure python: '<div class=nothing>'" />
+			tal:replace="structure python:'<div class=%cnothing%c>' % (chr(0x22), chr(0x22))" />
 
 		<tal:block tal:define="
 			global type python: 'tag_name' in res and res['tag_name'] or '';
@@ -766,7 +766,7 @@
 
 		<tal:block
 			tal:condition="python: 'indent_ctr' in res and 'max_depth' in res"
-			tal:replace="structure python: '</div>' * (res['indent_ctr'] - res['max_depth'])" />
+			tal:replace="structure python: '</div>' * (res['indent_ctr'] - res['max_depth'] - 1)" />
 		</div>
 	</div>
 	<div class="service_comp_list">
--- conga/luci/site/luci/Extensions/LuciZopeAsync.py	2008/02/08 21:56:33	1.1.2.5
+++ conga/luci/site/luci/Extensions/LuciZopeAsync.py	2008/02/27 20:22:19	1.1.2.6
@@ -11,6 +11,7 @@
 from LuciZope import GetReqVars
 from ricci_communicator import RicciCommunicator
 from conga_constants import LUCI_DEBUG_MODE
+from LuciClusterInfo import LuciExtractCluModel
 
 luci_log = get_logger()
 
@@ -218,6 +219,7 @@
 
 def validate_clusvc_async(self, request):
 	from LuciValidation import validate_clusvc_add
-	ret = validate_clusvc_add(self, request)
+	model = LuciExtractCluModel(self, request)
+	ret = validate_clusvc_add(model, request)
 	xml_obj = result_to_xml(ret)
 	write_xml_resp(request, xml_obj)
Binary files /cvs/cluster/conga/luci/site/luci/var/Data.fs	2008/02/08 21:56:33	1.15.2.29 and /cvs/cluster/conga/luci/site/luci/var/Data.fs	2008/02/27 20:22:19	1.15.2.30 differ
rcsdiff: /cvs/cluster/conga/luci/site/luci/var/Data.fs: diff failed
--- conga/make/version.in	2008/02/12 17:40:38	1.21.2.34
+++ conga/make/version.in	2008/02/27 20:22:49	1.21.2.35
@@ -1,2 +1,2 @@
 VERSION=0.12.0
-RELEASE=5
+RELEASE=6