Changeset 3566

Timestamp:

Jul 18, 2007, 10:41:30 AM (16 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #678, #679, #680

Location:

trunk/www/common/plugin

Files:

• configure.jsp (modified) (3 diffs)
• parse_file.jsp (modified) (1 diff)
• test_with_file.jsp (modified) (3 diffs)

trunk/www/common/plugin/configure.jsp

@@ -279 +279 @@
       {
         Main.hide('valuecontainer');
-        if (pp.values.length > 0)
-        {
-          if (valueElement.length) // ie. radio buttons for boolean parameter
-          {
-            Forms.checkRadio(valueElement, pp.values[0]);
-          }
-          else if (!valueElement.disabled)
-          {
-            valueElement.value = pp.values[0];
-          }
+        var currentValue = pp.values.length > 0 ? pp.values[0] : '';
+        if (valueElement.length) // ie. radio buttons for boolean parameter
+        {
+          Forms.checkRadio(valueElement, currentValue);
+        }
+        else if (!valueElement.disabled)
+        {
+          valueElement.value = currentValue;
         }
       }
@@ -605 +603 @@
           parametersOnClick(param.name);
         }
-        else
-        {
-          updateStyle(param);
-        }
-      }
-    }
-    
+        updateStyle(param);
+      }
+    }
     </script>
   </base:head>
@@ -1009 +1003 @@
                     <table border="0" cellspacing="0" cellpadding="0">
                     <tr>
-                    <td><input type="text" class="text" name="<%=inputName%>" 
-                      size="50" value=""
+                    <td><input <%=pType.getNotNull() ? requiredClazz : clazz%> type="text" 
+                      name="<%=inputName%>" value=""
+                      size="50"
                       onblur="valueOnBlur(this.value)">&nbsp;</td>
                     <td><base:button 

trunk/www/common/plugin/parse_file.jsp

@@ -398 +398 @@
       id="mappings"
       title="Column mappings"
-      visible="<%=dataIsFound%>"
+      visible="<%=dataIsFound && request.getParameter("mappingParameterNames") != null%>"
       >
       <%

trunk/www/common/plugin/test_with_file.jsp

@@ -143 +143 @@
       var frm = document.forms['testwithfile'];
       var configWin = window.opener;
+      frm.path.value = configWin.getParameterValue('file');
       frm.header.value = configWin.getParameterValue('headerRegexp');
       frm.dataHeader.value = configWin.getParameterValue('dataHeaderRegexp');
@@ -163 +164 @@
         }
       }
-      Forms.createHidden(frm, 'mappingParameterNames', parameterNames.join(','));
+      if (parameterName.length > 0)
+      {
+        Forms.createHidden(frm, 'mappingParameterNames', parameterNames.join(','));
+      }
     }
     
@@ -170 +174 @@
       var frm = document.forms['testwithfile'];
       var configWin = window.opener;
+      configWin.setParameterValue('file', frm.path.value);
       configWin.setParameterValue('headerRegexp', frm.header.value);
       configWin.setParameterValue('dataHeaderRegexp', frm.dataHeader.value);