CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL4
Changes by: [EMAIL PROTECTED] 2007-08-23 18:47:34
Modified files:
. : conga.spec.in.in
luci/cluster : form-macros validate_config_qdisk.js
Log message:
Fix 253905: Quorum disk page: Minimum score does not need to be required
Fix 253904: [minor] Quorum disk page: Interval + tko should be together
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.67.2.14&r2=1.67.2.15
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.176.2.18&r2=1.176.2.19
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/validate_config_qdisk.js.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.5.2.2&r2=1.5.2.3
--- conga/conga.spec.in.in 2007/08/11 04:22:03 1.67.2.14
+++ conga/conga.spec.in.in 2007/08/23 18:47:32 1.67.2.15
@@ -326,8 +326,11 @@
- Fix bz238656 (conga does not set the "nodename" attribute for manual fencing)
- Fix bz245200 (Conga needs to support Internet Explorer 6.0 and later)
- Fix bz227723 (Entering bad password when creating a new cluster =
UnboundLocalError: local variable 'e' referenced before)
+- Fix bz253904 (Quorum disk page: Interval + tko should be together)
+- Fix bz253905 (Quorum disk page: Minimum score does not need to be required)
- Related: bz241417
- Resolves: bz238727, bz241414, bz238656, bz245200, bz227723
+- Resolves: bz253904, bz253905
* Tue Apr 30 2007 Ryan McCabe <[EMAIL PROTECTED]> 0.9.1-9
- Fix bz238656 (conga does not set the "nodename" attribute for manual fencing)
--- conga/luci/cluster/form-macros 2007/08/09 21:28:50 1.176.2.18
+++ conga/luci/cluster/form-macros 2007/08/23 18:47:34 1.176.2.19
@@ -1194,18 +1194,18 @@
</tr>
<tr class="systemsTable">
- <td class="systemsTable">Votes</td>
+ <td class="systemsTable">TKO</td>
<td class="systemsTable">
- <input type="text" name="votes"
- tal:attributes="value
clusterinfo/votes | nothing" />
+ <input type="text" name="tko"
+ tal:attributes="value
clusterinfo/tko | nothing" />
</td>
</tr>
<tr class="systemsTable">
- <td class="systemsTable">TKO</td>
+ <td class="systemsTable">Votes</td>
<td class="systemsTable">
- <input type="text" name="tko"
- tal:attributes="value
clusterinfo/tko | nothing" />
+ <input type="text" name="votes"
+ tal:attributes="value
clusterinfo/votes | nothing" />
</td>
</tr>
--- conga/luci/cluster/validate_config_qdisk.js 2007/08/09 21:28:50 1.5.2.2
+++ conga/luci/cluster/validate_config_qdisk.js 2007/08/23 18:47:34 1.5.2.3
@@ -180,17 +180,6 @@
clr_form_err(form.interval);
}
- if (!form.votes || str_is_blank(form.votes.value)) {
- errors.push('No votes setting was given.');
- set_form_err(form.votes);
- } else {
- if (!is_valid_int(form.votes.value, 1, null)) {
- errors.push('Votes values must be greater than
0.');
- set_form_err(form.votes);
- } else
- clr_form_err(form.votes);
- }
-
if (!form.tko || str_is_blank(form.tko.value)) {
errors.push('No TKO setting was given.');
set_form_err(form.tko);
@@ -202,15 +191,15 @@
clr_form_err(form.tko);
}
- if (!form.min_score || str_is_blank(form.min_score.value)) {
- errors.push('No minimum score setting was given.');
- set_form_err(form.min_score);
+ if (!form.votes || str_is_blank(form.votes.value)) {
+ errors.push('No votes setting was given.');
+ set_form_err(form.votes);
} else {
- if (!is_valid_int(form.min_score.value, 1, null)) {
- errors.push('Minimum score values must be
greater than 0.');
- set_form_err(form.min_score);
+ if (!is_valid_int(form.votes.value, 1, null)) {
+ errors.push('Votes values must be greater than
0.');
+ set_form_err(form.votes);
} else
- clr_form_err(form.min_score);
+ clr_form_err(form.votes);
}
var no_dev = !form.device || str_is_blank(form.device.value);
@@ -226,6 +215,23 @@
if (err)
errors = errors.concat(err);
}
+
+ if (hnum > 1) {
+ if (!form.min_score ||
str_is_blank(form.min_score.value)) {
+ errors.push('No minimum score setting
was given.');
+ set_form_err(form.min_score);
+ } else {
+ if (!is_valid_int(form.min_score.value,
1, null)) {
+ errors.push('Minimum score
values must be greater than 0.');
+ set_form_err(form.min_score);
+ } else
+ clr_form_err(form.min_score);
+ }
+ } else {
+ clr_form_err(form.min_score);
+ }
+ } else {
+ clr_form_err(form.min_score);
}
}
