Skip to content

fix npes on template page #8917

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 2 commits into from
Aug 12, 2022
Merged

fix npes on template page #8917

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec108ab
fix npes on template page
qqmyers Aug 12, 2022
6b801bd
add == true for clarity
qqmyers Aug 12, 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
16 changes: 2 additions & 14 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.hasRestrictedFiles}">
<div class="form-group" jsf:rendered="#{!settingsWrapper.publicInstall and datasetPage== true 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 Down Expand Up @@ -295,19 +295,7 @@
<ui:fragment rendered="#{!empty editMode}">
<div class="form-group" jsf:rendered="#{!settingsWrapper.publicInstall}">
<p:fragment id="termsOfAccessHelp">
<ui:remove>
<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']}"/>
<h:outputFormat value=" #{bundle['file.dataFilesTab.terms.list.termsOfAccess.description.line.2']}" escape="false">
<f:param value="#{systemConfig.guidesBaseUrl}"/>
<f:param value="#{systemConfig.guidesVersion}"/>
</h:outputFormat>
</p>
</ui:fragment>
</ui:remove>
<ui:fragment rendered="#{DatasetPage.hasRestrictedFiles}">
<ui:fragment rendered="#{datasetPage == true and 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 Down