[Cluster-devel] conga/luci/cluster form-macros
jparsons at sourceware.org
jparsons at sourceware.org
Fri Sep 22 20:08:40 UTC 2006
CVSROOT: /cvs/cluster
Module name: conga
Changes by: jparsons at sourceware.org 2006-09-22 20:08:40
Modified files:
luci/cluster : form-macros
Log message:
Fixed evil ignoring of a return code
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&r1=1.61&r2=1.62
--- conga/luci/cluster/form-macros 2006/09/22 18:21:59 1.61
+++ conga/luci/cluster/form-macros 2006/09/22 20:08:40 1.62
@@ -27,9 +27,14 @@
<div metal:define-macro="clusters-form">
<div id="cluster_list">
<div class="cluster" tal:repeat="clu clusystems">
+ <tal:define="global ragent python: here.getRicciAgent(clu) | nothing/>
+ <span tal:condition="not ragent">
+ <h4><font color="red">An error occurred when trying to contact any of the nodes in the <span tal:content="clu"/>.</font></h4>
+ <hr/>
+ </span>
+ <span tal:condition="ragent">
<tal:block
- tal:define="ragent python: here.getRicciAgent(clu);
- global stat python: here.getClusterStatus(ragent);
+ tal:define="global stat python: here.getClusterStatus(ragent);
global cstatus python: here.getClustersInfo(stat,request);
global cluster_status python: 'cluster ' + (('running' in cstatus and cstatus['running'] == 'true') and 'running' or 'stopped');"
/>
@@ -111,6 +116,7 @@
</tr>
</table>
<hr>
+ </span>
</div>
</div>
</div>
More information about the Cluster-devel
mailing list