Fix disconnect of dataset version on edit files when templates are used

#2637
IQSS · Dec 11, 2015 · 9883aaa · 9883aaa
1 parent 5986dba
commit 9883aaa
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 53 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/Dataset.java b/src/main/java/edu/harvard/iq/dataverse/Dataset.java
@@ -219,25 +219,11 @@ private DatasetVersion createNewDatasetVersion(Template template) {
         DatasetVersion dsv = new DatasetVersion();
         dsv.setVersionState(DatasetVersion.VersionState.DRAFT);
         dsv.setFileMetadatas(new ArrayList());
-        DatasetVersion latestVersion = null;
+        DatasetVersion latestVersion;
 
         //if the latest version has values get them copied over
-        if (!(template == null)) {
-            if (!template.getDatasetFields().isEmpty()) {
-                dsv.setDatasetFields(dsv.copyDatasetFields(template.getDatasetFields()));
-            }           
-            if (template.getTermsOfUseAndAccess() != null){
-                TermsOfUseAndAccess terms= template.getTermsOfUseAndAccess().copyTermsOfUseAndAccess();
-                terms.setDatasetVersion(dsv);
-                dsv.setTermsOfUseAndAccess(terms);
-            } else {
-                TermsOfUseAndAccess terms = new TermsOfUseAndAccess();
-                terms.setDatasetVersion(dsv);
-                terms.setLicense(TermsOfUseAndAccess.License.CC0);
-                terms.setDatasetVersion(dsv);
-                dsv.setTermsOfUseAndAccess(terms);
-            }
-
+        if (template != null) {
+            dsv.updateDefaultValuesFromTemplate(template);
         } else {
             latestVersion = getLatestVersionForCopy();
             if (latestVersion.getDatasetFields() != null && !latestVersion.getDatasetFields().isEmpty()) {
@@ -284,6 +270,7 @@ private DatasetVersion createNewDatasetVersion(Template template) {
         return dsv;
     }
 
+
     public DatasetVersion getEditVersion() {
         return getEditVersion(null);
     }
@@ -299,20 +286,13 @@ public DatasetVersion getEditVersion(Template template) {
         }
     }
 
-    public DatasetVersion getCreateVersion() {
+ public DatasetVersion getCreateVersion() {
         DatasetVersion dsv = new DatasetVersion();
         dsv.setVersionState(DatasetVersion.VersionState.DRAFT);
-        dsv.setDataset(this);
-        dsv.setDatasetFields(dsv.initDatasetFields());
-        dsv.setFileMetadatas(new ArrayList());
-        TermsOfUseAndAccess terms = new TermsOfUseAndAccess();
-        terms.setDatasetVersion(dsv);
-        terms.setLicense(TermsOfUseAndAccess.License.CC0);
-        terms.setTermsOfAccess("");
-        dsv.setTermsOfUseAndAccess(terms);
+        dsv.setDataset(this);        
+        dsv.initDefaultValues();
         this.setVersions(new ArrayList());
         getVersions().add(0, dsv);
-
         return dsv;
     }
 

diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -860,35 +860,12 @@ public void updateSelectedTemplate(ValueChangeEvent event) {
 
         selectedTemplate = (Template) event.getNewValue();
         if (selectedTemplate != null) {
-            /*
-            If the user added files to the dataset prior to 
-            changing versions we want to capture them and 
-            reattach to the new version
-            */
-            //First get files from current version
-            List<FileMetadata> addedFiles = new ArrayList();
-            if (!workingVersion.getFileMetadatas().isEmpty()){
-                for (FileMetadata fmd: workingVersion.getFileMetadatas() ){
-                    addedFiles.add(fmd);
-                }
-            }
             //then create new working version from the selected template
-            workingVersion = dataset.getEditVersion(selectedTemplate);
-            //Finally reattach the files to the new working version
-            if(!addedFiles.isEmpty()){
-                for(FileMetadata fmd : addedFiles){
-                    workingVersion.getFileMetadatas().add(fmd);
-                    fmd.setDatasetVersion(workingVersion);
-                }
-            }
+            workingVersion.updateDefaultValuesFromTemplate(selectedTemplate); 
             updateDatasetFieldInputLevels();
-        } else {
-            dataset = new Dataset();
-            dataset.setOwner(dataverseService.find(ownerId));
-            workingVersion = dataset.getCreateVersion();
+        } else { 
+            workingVersion.initDefaultValues();
             updateDatasetFieldInputLevels();
-
-            dataset.setIdentifier(datasetService.generateIdentifierSequence(protocol, authority, separator));
         }
         resetVersionUI();
     }

diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java
@@ -487,6 +487,35 @@ public boolean isMinorUpdate() {
         }
         return true;
     }
+
+    public void updateDefaultValuesFromTemplate(Template template) {
+        if (!template.getDatasetFields().isEmpty()) {
+            this.setDatasetFields(this.copyDatasetFields(template.getDatasetFields()));
+        }
+        if (template.getTermsOfUseAndAccess() != null) {
+            TermsOfUseAndAccess terms = template.getTermsOfUseAndAccess().copyTermsOfUseAndAccess();
+            terms.setDatasetVersion(this);
+            this.setTermsOfUseAndAccess(terms);
+        } else {
+            TermsOfUseAndAccess terms = new TermsOfUseAndAccess();
+            terms.setDatasetVersion(this);
+            terms.setLicense(TermsOfUseAndAccess.License.CC0);
+            terms.setDatasetVersion(this);
+            this.setTermsOfUseAndAccess(terms);
+        }
+    }
+
+    public void initDefaultValues() {
+        //first clear then initialize - in case values were present 
+        // from template or user entry
+        this.setDatasetFields(new ArrayList());
+        this.setDatasetFields(this.initDatasetFields());
+        TermsOfUseAndAccess terms = new TermsOfUseAndAccess();
+        terms.setDatasetVersion(this);
+        terms.setLicense(TermsOfUseAndAccess.License.CC0);
+        this.setTermsOfUseAndAccess(terms);
+
+    }
 
     public DatasetVersion getMostRecentlyReleasedVersion() {
         if (this.isReleased()) {