/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 4916

Added by walbridge over 15 years ago

Further fixes to handle mixed-file uploads:
- set the fileCount object based on upCount existing files
- use ucount only if it exists; remove debugging'
- the entry form javascript now correctly tracks the file numbers, and can be relied on instead of using upCount

Cosmetic:
- fix large boxes appearing around new keywords / associated parties / taxons by forcing them to use corrected style

k
M lib/style/common/templates/entryForm.js
M src/perl/register-dataset.cgi

         return count;
+    }
     function setCount(_count, val) {
         var countField = document.getElementById(_count);
         var count = countField.getAttribute("value");
         countField.setAttribute("value", val);
         return count;
+    }
     function createImageLink(imgSrc, imgAlt, imgOnClick, cursor) {
         var link = document.createElement("a");
         var img = document.createElement("img");
-...
         labelTD.appendChild(createHiddenInput("aoRole", AORole));
         var imgTD = createTD("","right");
         imgTD.className = 'rightCol';
         imgTD.appendChild(createImageLink(contextUrl + "/style/images/previous.gif",
                                           "Move Up","moveUpRow(event)","pointer"));
         imgTD.appendChild(document.createTextNode(" "));
-...
         labelTD.appendChild(createHiddenInput("taxonRank", taxonRank));
         var imgTD = createTD("","right");
         imgTD.className = 'rightCol';
         imgTD.appendChild(createImageLink(contextUrl + "/style/images/previous.gif",
                                           "Move Up", "moveUpRow(event)",
                                           "pointer"));
-...
         labelTD.appendChild(createHiddenInput("keywordTh", keywordTh));
         var imgTD = createTD("","right");
         imgTD.className = 'rightCol';
         imgTD.appendChild(createImageLink(contextUrl + "/style/images/previous.gif",
                                           "Move Up", "moveUpRow(event)",
                                           "pointer"));
-...
             this.id = fcount.value;
         } else {
             // upCount contains pre-existing uploads, check this for editing existing packages
             if (ucount.value > 0) {
             if (ucount != null && ucount.value > 0) {
                 this.id = ucount.value;
                 alert(this.id);
+            }
+        }
-...
                 // What to do when a file is selected
                 element.onchange = function() {
                 // Increment file counter
                 var fileCount = incrementCount("fileCount");
                     // Increment file counter
                     var fileCount = incrementCount("fileCount");
                     // If pre-existing uploads exist, make sure the fileCount is synced
                     if (ucount != null && ucount.value > 0) {
                         fileCount += ucount.value;
                         setCount("fileCount", fileCount);
+                    }
                     // Clean up file text
                     var comment_element = document.getElementById( 'file_comment' );
                     if (comment_element) {

                 debug("Processing file: $fn");
                 # Upload the file object itself to a temporary file, copy file metadata to form
                 my $fileInfo = processFile($fileName);
                 # if we have existing uploads, increment the counter to avoid overwriting
                 my $totalFileNum = $fileNum + $FORM::upCount;
                 $$templateVars{"upload_$totalFileNum"} = $fileInfo->{'fileHash'};
                 $$templateVars{"uploadname_$totalFileNum"} = $fileInfo->{'fileName'};
                 $$templateVars{"uploadtype_$totalFileNum"} = $fileInfo->{'contentType'};
                 $$templateVars{"uploadperm_$totalFileNum"} = param("uploadperm_$fileNum");
                 $$templateVars{"upload_$fileNum"} = $fileInfo->{'fileHash'};
                 $$templateVars{"uploadname_$fileNum"} = $fileInfo->{'fileName'};
                 $$templateVars{"uploadtype_$fileNum"} = $fileInfo->{'contentType'};
                 $$templateVars{"uploadperm_$fileNum"} = param("uploadperm_$fileNum");
                 $uploadCount++;
+            }
+        }

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 4916

Added by walbridge over 15 years ago