[Cluster-devel] conga/luci cluster/cluster_svc-macros site/luc ...

[Cluster-devel] conga/luci cluster/cluster_svc-macros site/luc ...

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2008-02-27 20:09:19

Modified files:
	luci/cluster   : cluster_svc-macros 
	luci/site/luci/Extensions: LuciZopeAsync.py 

Log message:
	Fix bz434586

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/cluster_svc-macros.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/LuciZopeAsync.py.diff?cvsroot=cluster&r1=1.8&r2=1.9

--- conga/luci/cluster/cluster_svc-macros	2008/02/08 21:47:55	1.4
+++ conga/luci/cluster/cluster_svc-macros	2008/02/27 20:09:19	1.5
@@ -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:47:56	1.8
+++ conga/luci/site/luci/Extensions/LuciZopeAsync.py	2008/02/27 20:09:19	1.9
@@ -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)