Merge pull request #80 from mderuijter/dd-484-empty-custom-license-only-fields-before-saving-standard-license

DD-484 empty custom license only fields before saving standard license

Author: janvanmansum

src/main/java/edu/harvard/iq/dataverse/DatasetPage.java

@@ -3606,6 +3606,7 @@ private void setLicense(DatasetVersion editVersion) throws FetchException {
         } else {
             License license = licenseServiceBean.getById(licenseId);
             terms.setLicense(license);
+            terms.clearCustomTermsVariables();
         }
     }
 

src/main/java/edu/harvard/iq/dataverse/TermsOfUseAndAccess.java

@@ -278,6 +278,17 @@ public edu.harvard.iq.dataverse.License getCC0() {
         edu.harvard.iq.dataverse.License license = new edu.harvard.iq.dataverse.License("CC0", shortDescription, uri, iconUrl, true);
         return license;
     }
+
+    public void clearCustomTermsVariables(){
+        termsOfUse = null;
+        confidentialityDeclaration = null;
+        specialPermissions = null;
+        restrictions = null;
+        citationRequirements = null;
+        depositorRequirements = null;
+        conditions = null;
+        disclaimer = null;
+    }
 
     /**
      * @todo What does the GUI use for a default license? What does the "native"