5190 restrict file on dataset create

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

@@ -2571,6 +2571,33 @@ Do note that if we are deleting any files that have UNFs (i.e.,
            - but we will do this inside the UpdateDatasetCommand.
         */
     }
+
+    private String enteredTermsOfAccess;
+
+    public String getEnteredTermsOfAccess() {
+        return enteredTermsOfAccess;
+    }
+
+    public void setEnteredTermsOfAccess(String enteredTermsOfAccess) {
+        this.enteredTermsOfAccess = enteredTermsOfAccess;
+    }
+
+    private Boolean enteredFileAccessRequest;
+
+    public Boolean getEnteredFileAccessRequest() {
+        return enteredFileAccessRequest;
+    }
+
+    public void setEnteredFileAccessRequest(Boolean fileAccessRequest) {
+        this.enteredFileAccessRequest = fileAccessRequest;
+    }
+
+
+     public String saveWithTermsOfUse() {
+        workingVersion.getTermsOfUseAndAccess().setTermsOfAccess(enteredTermsOfAccess);
+        workingVersion.getTermsOfUseAndAccess().setFileAccessRequest(enteredFileAccessRequest);
+        return save();
+    }
 
     public String save() {
          //Before dataset saved, write cached prov freeform to version
@@ -2586,7 +2613,7 @@ public String save() {
             //FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, "Validation Error", "See below for details."));
             return "";
         }
-
+        
         // Use the Create or Update command to save the dataset: 
         Command<Dataset> cmd;
         try {

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

@@ -998,7 +998,10 @@ private void removeDataFileFromList(List<DataFile> dfs, DataFile dfToDelete) {
 
     public String saveWithTermsOfUse() {
         logger.fine("saving terms of use, and the dataset version");
-        datasetUpdateRequired = true; 
+        //Set update required only if dataset already exists
+        if (dataset.getId() != null){
+             datasetUpdateRequired = true; 
+        }
         return save();
     }
 
@@ -1094,28 +1097,27 @@ public String save() {
         int nExpectedFilesTotal = nOldFiles + nNewFiles; 
 
         if (nNewFiles > 0) {
-            Dataset lockTest = datasetService.find(dataset.getId());
-            //SEK 09/19/18 Get Dataset again to test for lock just in case the user downloads the rsync script via the api while the 
-            // edit files page is open and has already loaded a file in http upload for Dual Mode
-            if(dataset.isLockedFor(DatasetLock.Reason.DcmUpload) || lockTest.isLockedFor(DatasetLock.Reason.DcmUpload)){
-                System.out.print("Kill file save because locked for DCMUpload");
-                logger.log(Level.INFO, "Couldn''t save dataset: {0}", "DCM script has been downloaded for this dataset. Additonal files are not permitted."
-                        + "");
-                populateDatasetUpdateFailureMessage();
-                return null;               
-            }
-
-
-            for (DatasetVersion dv : lockTest.getVersions()) {
-                if (dv.isHasPackageFile()) {
-                    logger.log(Level.INFO, ResourceBundle.getBundle("Bundle").getString("file.api.alreadyHasPackageFile")
+            //SEK 10/15/2018 only apply the following tests if dataset has already been saved.
+            if (dataset.getId() != null) {
+                Dataset lockTest = datasetService.find(dataset.getId());
+                //SEK 09/19/18 Get Dataset again to test for lock just in case the user downloads the rsync script via the api while the 
+                // edit files page is open and has already loaded a file in http upload for Dual Mode
+                if (dataset.isLockedFor(DatasetLock.Reason.DcmUpload) || lockTest.isLockedFor(DatasetLock.Reason.DcmUpload)) {
+                    logger.log(Level.INFO, "Couldn''t save dataset: {0}", "DCM script has been downloaded for this dataset. Additonal files are not permitted."
                             + "");
                     populateDatasetUpdateFailureMessage();
                     return null;
                 }
-            }  
-
-
+                for (DatasetVersion dv : lockTest.getVersions()) {
+                    if (dv.isHasPackageFile()) {
+                        logger.log(Level.INFO, ResourceBundle.getBundle("Bundle").getString("file.api.alreadyHasPackageFile")
+                                + "");
+                        populateDatasetUpdateFailureMessage();
+                        return null;
+                    }
+                }
+            }
+
             // Try to save the NEW files permanently: 
             List<DataFile> filesAdded = ingestService.saveAndAddFilesToDataset(workingVersion, newFiles);
 

src/main/webapp/editFilesFragment.xhtml

@@ -654,23 +654,38 @@
                         #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
                     </span>
                 </label>
-                <div class="col-sm-9" jsf:rendered="#{!empty EditDatafilesPage.workingVersion.termsOfUseAndAccess}">
-                    <p:inputTextarea value="#{EditDatafilesPage.workingVersion.termsOfUseAndAccess.termsOfAccess}" autoResize="false" rows="5" styleClass="form-control" />
+                <ui:fragment rendered="#{!datasetPage}">
+                <div class="col-sm-9" jsf:rendered="#{!empty version.termsOfUseAndAccess}">
+                    <p:inputTextarea value="#{version.termsOfUseAndAccess.termsOfAccess}" autoResize="false" rows="5" styleClass="form-control" />
                 </div>
+                </ui:fragment> 
+                <ui:fragment rendered="#{datasetPage}">
+                <div class="col-sm-9" jsf:rendered="#{!empty version.termsOfUseAndAccess}">
+                    <p:inputTextarea value="#{DatasetPage.enteredTermsOfAccess}" autoResize="false" rows="5" styleClass="form-control" />
+                </div>
+                </ui:fragment> 
             </div>
             <div class="form-group">
                 <label for="metadata_RequestAccess" class="col-sm-3 control-label">
                     <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.title']}">
                         #{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess']}
                     </span>
                 </label>
-                <div class="col-sm-9" jsf:rendered="#{!empty EditDatafilesPage.workingVersion.termsOfUseAndAccess}">
-                    <p:selectBooleanCheckbox id="editFileRequestAccess" itemLabel="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.enableBtn']}" value="#{EditDatafilesPage.workingVersion.termsOfUseAndAccess.fileAccessRequest}"/>
+                <ui:fragment rendered="#{!datasetPage}">
+                <div class="col-sm-9" jsf:rendered="#{!empty version.termsOfUseAndAccess}">
+                    <p:selectBooleanCheckbox id="editFileRequestAccess" itemLabel="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.enableBtn']}" value="#{version.termsOfUseAndAccess.fileAccessRequest}"/>
+                </div>
+                </ui:fragment> 
+                <ui:fragment rendered="#{datasetPage}">
+                <div class="col-sm-9" jsf:rendered="#{!empty version.termsOfUseAndAccess}">
+                    <p:selectBooleanCheckbox id="editFileRequestAccessDSP" itemLabel="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.enableBtn']}" value="#{DatasetPage.enteredFileAccessRequest}"/>
                 </div>
+                </ui:fragment>
             </div>
         </div>
         <div class="button-block">
-            <p:commandButton value="#{bundle.continue}" onclick="PF('editFileAccessPopup').hide()" update=":datasetForm,:messagePanel" action="#{EditDatafilesPage.saveWithTermsOfUse()}" />
+            <p:commandButton rendered="#{!datasetPage}" value="#{bundle.continue}" onclick="PF('editFileAccessPopup').hide()" update=":datasetForm,:messagePanel" action="#{EditDatafilesPage.saveWithTermsOfUse()}" />
+            <p:commandButton rendered="#{datasetPage}" value="#{bundle.continue}" onclick="PF('editFileAccessPopup').hide()" update=":datasetForm,:messagePanel" action="#{DatasetPage.saveWithTermsOfUse()}" />
             <p:commandButton value="#{bundle.cancel}" onclick="PF('editFileAccessPopup').hide();PF('blockFileForm').hide();" type="button" />
         </div>
     </p:dialog>

src/main/webapp/editdatafiles.xhtml

@@ -99,6 +99,7 @@
                     <ui:include src="editFilesFragment.xhtml">
                         <ui:param name="createDataset" value="false"/>
                         <ui:param name="showFileButtonUpdate" value="true"/>
+                        <ui:param name="version" value="#{EditDatafilesPage.workingVersion}"/>
                         </ui:include>
                     </div>