Fix save of Tags on multiple files

IQSS · Sep 13, 2015 · 24320b3 · 24320b3
1 parent 131df7d
commit 24320b3
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 46 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -3060,62 +3060,39 @@ public void saveFileTagsAndCategories() {
         // page with the FileMetadata.setCategoriesByName() method. 
         // So here we only need to take care of the new, custom category
         // name, if entered: 
-        if (bulkUpdateCheckVersion()){
-           refreshSelectedFiles(); 
-        }
-        for (FileMetadata fmd: workingVersion.getFileMetadatas()){
-                    if (selectedFiles != null && selectedFiles.size() > 0) {
-            for (FileMetadata fm : selectedFiles) {
-                if (fm.getDataFile().equals(fmd.getDataFile())){
-                    fmd.setCategories(new ArrayList());
-                }
-                fm.setCategories(new ArrayList());
-            }
-        }
-
+        if (bulkUpdateCheckVersion()) {
+            refreshSelectedFiles();
         }
-
-        logger.fine("New category name: " + newCategoryName);
-
-        if (newCategoryName != null) {
+        for (FileMetadata fmd : workingVersion.getFileMetadatas()) {
             if (selectedFiles != null && selectedFiles.size() > 0) {
                 for (FileMetadata fm : selectedFiles) {
-                    if (newCategoryName != null) {
-                        fm.addCategoryByName(newCategoryName);
+                    if (fm.getDataFile().equals(fmd.getDataFile())) {
+                        fmd.setCategories(new ArrayList());
+                        if (newCategoryName != null) {
+                            fmd.addCategoryByName(newCategoryName);
+                        }
+                        // 2. Tabular DataFile Tags: 
+                        if (selectedTags != null) {
+                            for (int i = 0; i < selectedTags.length; i++) {
+                                    fmd.addCategoryByName(selectedTags[i]);
+                            }
+                        }
                     }
                 }
             }
-        } else {
-            logger.fine("No FileMetadata selected, or no category specified!");
-        }
-        newCategoryName = null;
-
-        // 2. Tabular DataFile Tags: 
-
-        if (selectedTags != null) {
-            if (selectedFiles != null && selectedFiles.size() > 0) {
-                for (FileMetadata fm : selectedFiles){
-                if (newCategoryName != null){
-                    fileMetadataSelectedForTagsPopup.addCategoryByName(newCategoryName);
-                }
-                for (int i = 0; i < selectedTags.length; i++) {
-
-                    try {
-                        fm.addCategoryByName(selectedTags[i]);
-                    } catch (IllegalArgumentException iax) {
-                        // ignore 
-                    }
-                }                    
-                }               
+        }                 
                 // success message: 
                 String successMessage = JH.localize("file.assignedTabFileTags.success");
                 logger.fine(successMessage);
                 successMessage = successMessage.replace("{0}", "Selected Files");
                 JsfHelper.addFlashMessage(successMessage);
-            }
-            // reset:
-            selectedTags = null;
-        }
+         selectedTags = null;
+
+        logger.fine("New category name: " + newCategoryName);
+
+        newCategoryName = null;
+
+
         save();
     }
 

diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
@@ -730,7 +730,7 @@
                         </div>
                     </p:dialog>
 
-                                        <p:dialog id="fileTagsPopup" styleClass="smallPopUp" header="#{bundle['file.editTags']}" widgetVar="fileTagsPopup" modal="true">
+                    <p:dialog id="fileTagsPopup" styleClass="smallPopUp" header="#{bundle['file.editTags']}" widgetVar="fileTagsPopup" modal="true">
                         <p class="help-block"><span class="glyphicon glyphicon-info-sign"/> #{bundle['file.editTagsDialog.tip']}</p>
                         <div class="form-horizontal" jsf:rendered="#{!(empty DatasetPage.selectedFiles)}">
                             <div class="form-group">