Merge pull request #121 from dabercro/master

Split Radio Buttons

Author: Daniel Abercrombie

setup.py

@@ -19,6 +19,7 @@
         },
     install_requires=[
         'cmstoolbox',
+        'more-itertools<6.0.0',
         'cherrypy<18.0.0',
         'mako',
         'numpy>=1.6.1',

workflowwebtools/__init__.py

@@ -4,6 +4,6 @@
 :author: Daniel Abercrombie <dabercro@mit.edu>
 """
 
-__version__ = '0.9.3'
+__version__ = '0.9.4'
 
 __all__ = []

workflowwebtools/web/static/js/submit.js

@@ -1,7 +1,8 @@
 var allHeader = "All Steps (use this or fill all others)";
 
 function normalize (s) {
-    return s.replace(/^_+/, "");
+    return s.replace(/__\d*$/, ""). // Remove the counter for separating radios
+        replace(/^_+/, "");         // Remove leading "_". Don't remember what those are from.
 }
 
 function printSiteLists (method, params) {
@@ -107,6 +108,8 @@ function makeTable (option, params) {
     else
         addParamTable().style.margin = "15px 0px 15px 0px";
 
+    counter = 0;
+
     $(".paramtable").each(function () {
         var paramtable = this;
         option.opts.forEach(function (opt) {
@@ -117,7 +120,7 @@ function makeTable (option, params) {
                 optDiv.appendChild(document.createTextNode("    " + value + "  "));
                 var radio = optDiv.appendChild(document.createElement("input"));
                 radio.type = "radio";
-                radio.name = opt.name;
+                radio.name = opt.name + "__" + counter;
                 radio.value = value;
                 radio.ondblclick = function() {
                     this.checked = false;
@@ -133,6 +136,9 @@ function makeTable (option, params) {
             input.type = "text";
             input.name = text;
         });
+
+        // Increment counter so that radio buttons are split
+        counter++;
     });
 };