backport from HEAD

Author: Richard Jones

CHANGES.txt

@@ -8,6 +8,7 @@ Fixed:
 - added script to help migrating queries from pre-0.6 trackers
 - Fixed "documentation" of getnodeids in roundup.hyperdb
 - added flush() to DevNull (sf bug #835365)
+- fixed javascript for help window for only one checkbox case
 - Date arithmetic was utterly broken, and has been for a long time.
   Date +/- Interval now works, and Date - Date also works (produces
   an Interval.

templates/classic/html/help_controls.js

@@ -51,29 +51,34 @@ function trim(value) {
   return temp;
 }
 
-function updateList() {
-  // write back to opener window
+function determineList() {
+  // generate a comma-separated list of the checked items
   if (document.frm_help.check==undefined) { return; }
   var list = new Array();
-  for (box=0; box < document.frm_help.check.length; box++) {
-      if (document.frm_help.check[box].checked) {
-          list.push(document.frm_help.check[box].value);
+  if (document.frm_help.check.length==undefined) {
+      if (document.frm_help.check.checked) {
+          list.push(document.frm_help.check.value);
+      }
+  } else {
+      for (box=0; box < document.frm_help.check.length; box++) {
+          if (document.frm_help.check[box].checked) {
+              list.push(document.frm_help.check[box].value);
+          }
       }
   }
-  window.opener.document.itemSynopsis[field].value = list.join(",");
+  return new String(list.join(','));
+}
+
+function updateList() {
+  // write back to opener window
+  if (document.frm_help.check==undefined) { return; }
+  window.opener.document.itemSynopsis[field].value = determineList();
 }
 
 function updatePreview() {
-  // add new checkbox selections to preview
+  // update the preview box
   if (document.frm_help.check==undefined) { return; }
-  var list = new Array();
-  for (box=0; box < document.frm_help.check.length; box++) {
-      if (document.frm_help.check[box].checked) {
-          list.push(document.frm_help.check[box].value);
-      }
-  }
-  listString = new String(list.join(','));
-  writePreview(listString);
+  writePreview(determineList());
 }
 
 function clearList() {
@@ -89,8 +94,8 @@ function reviseList(vals) {
   if (document.frm_help.check==undefined) { return; }
   var to_check;
   var list = vals.split(",");
-   for (box=0; box < document.frm_help.check.length; box++) {
-      check = document.frm_help.check[box];
+  if (document.frm_help.check.length==undefined) {
+      check = document.frm_help.check;
       to_check = false;
       for (val in list) {
           if (check.value==trim(list[val])) {
@@ -99,16 +104,8 @@ function reviseList(vals) {
           }
       }
       check.checked = to_check;
-  }
-}
-
-function resetList() {
-  // reset preview and check boxes to initial values
-  if (document.frm_help.check==undefined) { return; }
-  var to_check;
-  var list = original_field.split(',');
-  writePreview(list);
-  for (box=0; box < document.frm_help.check.length; box++) {
+  } else {
+    for (box=0; box < document.frm_help.check.length; box++) {
       check = document.frm_help.check[box];
       to_check = false;
       for (val in list) {
@@ -118,9 +115,17 @@ function resetList() {
           }
       }
       check.checked = to_check;
+    }
   }
 }
 
+function resetList() {
+  // reset preview and check boxes to initial values
+  if (document.frm_help.check==undefined) { return; }
+  writePreview(original_field);
+  reviseList(original_field);
+}
+
 function writePreview(val) {
    // writes a value to the text_preview
    document.frm_help.text_preview.value = val;