[Cluster-devel] conga/luci cluster/validate_fence.js site/luci ...
rmccabe at sourceware.org
rmccabe at sourceware.org
Mon Jul 23 18:53:09 UTC 2007
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2007-07-23 18:53:08
Modified files:
luci/cluster : validate_fence.js
luci/site/luci/Extensions: cluster_adapters.py
Log message:
Fix a javascript bug
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/validate_fence.js.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&r1=1.261&r2=1.262
--- conga/luci/cluster/validate_fence.js 2007/07/12 02:42:42 1.9
+++ conga/luci/cluster/validate_fence.js 2007/07/23 18:53:08 1.10
@@ -258,7 +258,15 @@
for (var j = 0 ; j < select_elem.length ; j++) {
temp += '<input type="text" name="' + escapeXML(select_elem[j].name) + '" value="' + escapeXML(select_elem[j].options[select_elem[j].options.selectedIndex].value) + '" />';
}
- form_xml += '<form id="' + escapeXML(form[i].attributes['name'].value) + '">' + temp + '</form>';
+ var form_name = '';
+
+ try {
+ form_name = form[i].attributes['name'].value;
+ } catch (e) {
+ form_name = form[i].getAttribute('name');
+ }
+
+ form_xml += '<form id="' + escapeXML(form_name) + '">' + temp + '</form>';
}
master_form.fence_xml.value = '<formlist>' + form_xml + '</formlist>';
--- conga/luci/site/luci/Extensions/cluster_adapters.py 2007/07/12 22:35:40 1.261
+++ conga/luci/site/luci/Extensions/cluster_adapters.py 2007/07/23 18:53:08 1.262
@@ -2193,7 +2193,8 @@
54: validateFenceEdit,
55: validateDaemonProperties,
57: deleteFenceDevice,
- 58: validateNodeFenceConfig
+ 58: validateNodeFenceConfig,
+ 80: process_cluster_conf_editor
}
def validatePost(self, request):
More information about the Cluster-devel
mailing list