Skip to content

Remove editVersion calls, standardize restricted file render logic #8902

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 3 commits into from
Aug 9, 2022
Merged

Remove editVersion calls, standardize restricted file render logic #8902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
01fd802
standardize calls w.r.t. hasRestrictedFiles and ToUaA
qqmyers Aug 3, 2022
6eba8fe
Merge remote-tracking branch 'IQSS/develop' into remove_editVersion_c…
qqmyers Aug 6, 2022
af0e068
allow DatasetPage.hasRestrictedFiles in xhtml
qqmyers Aug 9, 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: 1 addition & 1 deletion src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ public Boolean isHasValidTermsOfAccess() {

private Boolean hasRestrictedFiles = null;

public Boolean isHasRestrictedFiles(){
public boolean isHasRestrictedFiles(){
//cache in page to limit processing
if (hasRestrictedFiles != null){
return hasRestrictedFiles;
Expand Down
18 changes: 9 additions & 9 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 @@ -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 and DatasetPage.restrictedFileCount > 0}">
<div class="form-group" jsf:rendered="#{!settingsWrapper.publicInstall and DatasetPage.hasRestrictedFiles}">
<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 @@ -274,7 +274,7 @@
<p><h:outputText id="metadata_TermsAccessText" value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.termsOfAccess)}" escape="false"/></p>
</div>
</div>
<div class="form-group" jsf:rendered="#{!settingsWrapper.publicInstall and ( datasetPage == true and DatasetPage.restrictedFileCount > 0)}">
<div class="form-group" jsf:rendered="#{!settingsWrapper.publicInstall and ( datasetPage == true and DatasetPage.hasRestrictedFiles)}">
<label for="datasetForm:tabView:metadata_RequestAccessSelected" class="col-sm-3 control-label">
#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess']}
<span class="glyphicon glyphicon-question-sign tooltip-icon"
Expand All @@ -286,8 +286,8 @@
<h:outputText value="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.notRequest']}" rendered="#{!DatasetPage.dataset.fileAccessRequest}"/>
</p>
<p jsf:rendered="#{DatasetPage.workingVersion.draft}">
<h:outputText value="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.request']}" rendered="#{DatasetPage.workingVersion.termsOfUseAndAccess.fileAccessRequest}"/>
<h:outputText value="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.notRequest']}" rendered="#{!DatasetPage.workingVersion.termsOfUseAndAccess.fileAccessRequest}"/>
<h:outputText value="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.request']}" rendered="#{termsOfUseAndAccess.fileAccessRequest}"/>
<h:outputText value="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.notRequest']}" rendered="#{!termsOfUseAndAccess.fileAccessRequest}"/>
</p>
</div>
</div>
Expand All @@ -296,7 +296,7 @@
<div class="form-group" jsf:rendered="#{!settingsWrapper.publicInstall}">
<p:fragment id="termsOfAccessHelp">
<ui:remove>
<ui:fragment rendered="#{datasetPage == true and (!DatasetPage.dataset.editVersion.hasRestrictedFile or !DatasetPage.dataset.editVersion.termsOfUseAndAccess.fileAccessRequest)}">
<ui:fragment rendered="#{datasetPage == true and (!DatasetPage.hasRestrictedFiles or !termsOfUseAndAccess.fileAccessRequest)}">
<p class="help-block">

<h:outputText value=" #{bundle['file.dataFilesTab.terms.list.termsOfAccess.description']}"/>
Expand All @@ -307,7 +307,7 @@
</p>
</ui:fragment>
</ui:remove>
<ui:fragment rendered="#{DatasetPage.dataset.editVersion.hasRestrictedFile}">
<ui:fragment rendered="#{DatasetPage.hasRestrictedFiles}">
<div class="alert alert-info">
<span class="glyphicon glyphicon-info-sign"></span>&#160;<strong>#{bundle['messages.info']}</strong> –
<h:outputText value=" #{bundle['file.dataFilesTab.terms.list.termsOfAccess.description']}"/>
Expand All @@ -325,13 +325,13 @@
</label>
<div class="col-sm-9">
<p:selectBooleanCheckbox id="requestAccess" itemLabel="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.enableBtn']}"
value="#{termsOfUseAndAccess.fileAccessRequest}" disabled="#{datasetPage == true and !DatasetPage.isHasRestrictedFiles()}">
value="#{termsOfUseAndAccess.fileAccessRequest}" disabled="#{datasetPage == true and !DatasetPage.hasRestrictedFiles}">
<p:ajax event="change" update="termsOfAccessHelp" />
</p:selectBooleanCheckbox>
</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 DatasetPage.dataset.editVersion.hasRestrictedFile 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.hasRestrictedFiles 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 @@ -343,7 +343,7 @@
</label>
<div class="col-sm-9">
<p:inputTextarea id="metadata_TermsAccess" value="#{termsOfUseAndAccess.termsOfAccess}"
rows="5" styleClass="form-control" disabled="#{datasetPage == true and !DatasetPage.isHasRestrictedFiles()}" />
rows="5" styleClass="form-control" disabled="#{datasetPage == true and !DatasetPage.hasRestrictedFiles}" />

</div>
</div>
Expand Down