Skip to content

8832 toa validation error on ds create #8834

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kcondon merged 11 commits into from
Jul 25, 2022
Merged

8832 toa validation error on ds create #8834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6e195d7
#8832 fix error message render
sekmiller Jul 6, 2022
7d9c12e
#8832 fix TOA validator
sekmiller Jul 7, 2022
32cfd12
Merge branch 'develop' into 8832-TOA-validation-error-on-ds-create
sekmiller Jul 19, 2022
b0a25d1
#8832 simplify getting hasRestrictedFiles
sekmiller Jul 21, 2022
494045e
#8832 fix message panel update
sekmiller Jul 21, 2022
aaa8bf4
#8832 remove unused uiparam
sekmiller Jul 21, 2022
d3b0d1c
#8832 only show terms of access if restricted files present
sekmiller Jul 22, 2022
6d2b613
Merge branch 'develop' into 8832-TOA-validation-error-on-ds-create
sekmiller Jul 22, 2022
b7d2cfc
Merge branch 'develop' into 8832-TOA-validation-error-on-ds-create
sekmiller Jul 22, 2022
fa3f2b9
Merge branch 'develop' into 8832-TOA-validation-error-on-ds-create
sekmiller Jul 25, 2022
8074358
#8832 suppress toa if no restricted files
sekmiller Jul 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/main/java/edu/harvard/iq/dataverse/TemplatePage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,6 @@ public void edit(TemplatePage.EditMode editMode) {
}

public String save(String redirectPage) {

//SEK - removed dead code 1/6/2015

boolean create = false;
Command<Void> cmd;
Expand Down
10 changes: 5 additions & 5 deletions src/main/webapp/dataset-license-terms.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@
</p:fragment>
</div>
</div>
<div class="panel panel-default" jsf:rendered="#{!empty editMode or empty editMode and (!empty termsOfUseAndAccess.termsOfAccess
<div class="panel panel-default" jsf:rendered="#{!empty editMode or empty editMode and ((!empty termsOfUseAndAccess.termsOfAccess and DatasetPage.restrictedFileCount > 0)
or !empty termsOfUseAndAccess.dataAccessPlace
or !empty termsOfUseAndAccess.originalArchive or !empty termsOfUseAndAccess.availabilityStatus
or !empty termsOfUseAndAccess.contactForAccess or !empty termsOfUseAndAccess.sizeOfCollection
Expand All @@ -248,7 +248,7 @@
<div id="panelCollapseTOA" jsf:class="#{!datasetPage.hasValidTermsOfAccess ? 'collapse' : ''}">
<div class="panel-body">
<ui:fragment rendered="#{empty editMode}">
<div class="form-group" jsf:rendered="#{!settingsWrapper.publicInstall}">
<div class="form-group" jsf:rendered="#{!settingsWrapper.publicInstall and DatasetPage.restrictedFileCount > 0}">
<label for="datasetForm:tabView:metadata_RestrictedFiles" class="col-sm-3 control-label">
#{bundle['file.dataFilesTab.terms.list.termsOfAccess.restrictedFiles']}
<span class="glyphicon glyphicon-question-sign tooltip-icon"
Expand All @@ -264,7 +264,7 @@
</div>
</ui:fragment>
</div>
<div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.termsOfAccess}">
<div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.termsOfAccess and DatasetPage.restrictedFileCount > 0}">
<label for="datasetForm:tabView:metadata_TermsAccessText" class="col-sm-3 control-label">
#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
<span class="glyphicon glyphicon-question-sign tooltip-icon"
Expand Down Expand Up @@ -331,7 +331,7 @@
</div>
</div>
<p:fragment id="toaValidation">
<div class="ui-message ui-message-error ui-widget ui-corner-all" aria-live="polite" jsf:rendered="#{datasetPage == true and empty termsOfUseAndAccess.termsOfAccess and !termsOfUseAndAccess.fileAccessRequest}">
<div class="ui-message ui-message-error ui-widget ui-corner-all" aria-live="polite" jsf:rendered="#{datasetPage == true and DatasetPage.dataset.editVersion.hasRestrictedFile and empty termsOfUseAndAccess.termsOfAccess and !termsOfUseAndAccess.fileAccessRequest}">
<span class="ui-message-error-detail">#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.warning.outofcompliance']}</span>
</div>
</p:fragment>
Expand All @@ -351,7 +351,7 @@
<p:autoUpdate/>
<o:inputHidden id="termsofAccessHiddenLT" value="#{termsOfUseAndAccess.termsOfAccess}" />
<o:inputHidden id="fileAccessRequestHiddenLT" value="#{termsOfUseAndAccess.fileAccessRequest}" />
</p:fragment>
</p:fragment>

</ui:fragment>

Expand Down
7 changes: 4 additions & 3 deletions src/main/webapp/dataset.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -923,7 +923,8 @@
<div class="button-block" jsf:rendered="#{!empty DatasetPage.editMode}">
<p:commandButton id="saveBottomTerms" styleClass="btn btn-default" rendered="#{DatasetPage.editMode == 'LICENSE'}"
value="#{DatasetPage.editMode == 'CREATE' ? bundle['file.addBtn'] : bundle.saveChanges}"
onclick="testTOADatasetPage();"
onclick="testTOADatasetPage();"
update=":datasetForm,:messagePanel"
oncomplete="$(document).scrollTop(0);"/>
<p:commandButton id="saveBottom" styleClass="btn btn-default" value="#{DatasetPage.editMode == 'CREATE' ? bundle['file.addBtn'] : bundle.saveChanges}" rendered="#{DatasetPage.editMode == 'CREATE' or DatasetPage.editMode == 'METADATA'}"
onclick="PF('blockDatasetForm').show();"
Expand Down Expand Up @@ -1875,8 +1876,8 @@
//terms not present so save...
PF('blockDatasetForm').show();
datasetSaveCommand();
}
if (fileAccessRequestHidden === 'false' && termsofAccessHidden === '') {
}
if ('#{DatasetPage.isHasRestrictedFiles()}' === 'true' && fileAccessRequestHidden === 'false' && termsofAccessHidden === '') {
//Not compliant show error keep page open...
} else {
PF('blockDatasetForm').show();
Expand Down