Changeset 5763

Timestamp:

Sep 27, 2011, 9:17:56 AM (12 years ago)

Author:

Nicklas Nordborg

Message:

References #1604: Support for multiple files of the same type in a FileSet?

It was not possible to create platform variants due to compilation errors in the JSP. The edit dialog was missing options for setting "allow multiple files" of a a file type.

Location:

trunk/www/admin/platforms/variants

Files:

• edit_variant.jsp (modified) (7 diffs)
• index.jsp (modified) (2 diffs)
• view_variant.jsp (modified) (2 diffs)

trunk/www/admin/platforms/variants/edit_variant.jsp

@@ -189 +189 @@
           DataFileType dft = ft.getDataFileType();
           boolean required = ft.isRequired();
+          boolean multiple = ft.getAllowMultiple();
+          int value = 0;
+          if (required) value += 1;
+          if (multiple) value += 2;
           %>
-          Link.addNewItem(fileTypes, new Item('F', <%=dft.getId()%>, '<%=HTML.javaScriptEncode(dft.getName())%> <%=required ? "[×]" : "[-]"%>', '<%=required ? "1" : "0"%>'));
+          Link.addNewItem(fileTypes, new Item('F', <%=dft.getId()%>, '<%=HTML.javaScriptEncode(dft.getName())%> <%=required ? "[×]" : "[-]"%>', <%=value%>));
           <%
         }
@@ -206 +210 @@
       var frm = document.forms['variant'];
       var required = frm.required.checked;
-      if (!item) item = new Item('F', fileTypeId, name+(required ? '[×]' : '[-]'), required ? '1' : '0', '');
+      var multiple = frm.multiple.checked;
+      var newValue = 0;
+      if (required) newValue += 1;
+      if (multiple) newValue += 2;
+      if (!item) item = new Item('F', fileTypeId, name+(required ? '[×]' : '[-]'), newValue, '');
       Link.addItem(frm.fileTypes, item);
     }
@@ -219 +227 @@
       if (item && item.id)
       {
-        frm.required.checked = item.value != '0';
+        frm.required.checked = (item.value & 1) > 0;
+        frm.multiple.checked = (item.value & 2) > 0;
       }
       else
       {
         frm.required.checked = false;
+        frm.multiple.checked = false;
       }
     }
@@ -230 +240 @@
       var frm = document.forms['variant'];
       var required = frm.required.checked;
+      var multiple = frm.multiple.checked;
+      var newValue = 0;
+      if (required) newValue += 1;
+      if (multiple) newValue += 2;
       for (var i = 0; i < frm.fileTypes.length; i++)  // >
       {
@@ -235 +249 @@
         if (option.selected && option.item.id)
         {
-          option.item.value = required ? '1' : '0';
+          option.item.value = newValue;
           var text = option.text.replace(/\[.*\]/, '['+(required ? '×' : '-') +']');
           option.text = text; 
         }
       }
+    }
+    function multipleOnClick()
+    {
+      requiredOnClick();
     }
     </script>
@@ -347 +365 @@
         <select name="fileTypes" size="10" multiple style="width: 20em;" 
           onchange="fileTypesOnChange()">
-        </select>&nbsp;<br>
-        × = Required
-        <input type="checkbox" name="required" value="1" onchange="requiredOnClick()">
+        </select>
         <input type="hidden" name="modifiedFileTypes" value="">
         <input type="hidden" name="removedFileTypes" value="">
@@ -367 +383 @@
         /></td></tr>
         </table>
+        <input type="checkbox" id="required" name="required" value="1" onchange="requiredOnClick()">
+          <label for="required">Required</label><br>
+        <input type="checkbox" id="multiple" name="multiple" value="1" onchange="multipleOnClick()">
+          <label for="multiple">Allow multiple files</label>
       </td>
       </tr>     

trunk/www/admin/platforms/variants/index.jsp

@@ -30 +30 @@
   import="net.sf.basedb.core.Platform"
   import="net.sf.basedb.core.PlatformVariant"
+  import="net.sf.basedb.core.PlatformFileType"
   import="net.sf.basedb.core.DataFileType"
   import="net.sf.basedb.core.RawDataType"
@@ -173 +174 @@
         {
           DataFileType dft = DataFileType.getById(dc, ftId);
-          boolean required = Values.getBoolean(request.getParameter("F"+ftId));
-          platform.addFileType(dft, required, variant);
+          int options = Values.getInt(request.getParameter("F"+ftId));
+          PlatformFileType pft = platform.getFileType(dft, variant, true);
+          pft.setRequired((options & 1) > 0);
+          pft.setAllowMultiple((options & 2) > 0);
         }
       }

trunk/www/admin/platforms/variants/view_variant.jsp

@@ -294 +294 @@
           />
           <tbl:columndef 
+            id="multiple"
+            title="Multiple files"
+          />
+          <tbl:columndef 
             id="genericType"
             title="Generic type"
@@ -323 +327 @@
                   /><%=Base.getLinkedName(ID, dft, false, true)%></tbl:cell>
                 <tbl:cell column="required"><%=fileType.isRequired() ? "yes" : "no"%></tbl:cell>
+                <tbl:cell column="multiple"><%=fileType.getAllowMultiple() ? "yes" : "no"%></tbl:cell>
                 <tbl:cell column="genericType"><base:propertyvalue item="<%=dft%>" property="genericType" /></tbl:cell>
                 <tbl:cell column="description"><%=HTML.niceFormat(dft.getDescription())%></tbl:cell>