Skip to content

4286 metadata template preview fields #6303

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
Oct 22, 2019
Merged

4286 metadata template preview fields #6303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea65e5e
#4286 fix render logic for templates
sekmiller Oct 22, 2019
b522227
Merge branch 'develop' into 4286-metadata-template-preview-fields
sekmiller Oct 22, 2019
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
3 changes: 3 additions & 0 deletions 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 @@ -3110,6 +3110,9 @@ private void restrictFiles(boolean restricted) throws CommandException {
}

public int getRestrictedFileCount() {
if (workingVersion == null){
return 0;
}
int restrictedFileCount = 0;
for (FileMetadata fmd : workingVersion.getFileMetadatas()) {
if (fmd.isRestricted()) {
Expand Down
18 changes: 10 additions & 8 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 @@ -238,13 +238,15 @@
<span class="glyphicon glyphicon-question-sign tooltip-icon"
data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.restrictedFiles.title']}"></span>
</label>
<div class="col-sm-9">
<p>
<h:outputFormat value="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.restrictedFiles.txt']}">
<f:param value="#{DatasetPage.restrictedFileCount}"/>
</h:outputFormat>
</p>
</div>
<ui:fragment rendered="#{datasetPage == true}">
<div class="col-sm-9">
<p>
<h:outputFormat value="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.restrictedFiles.txt']}">
<f:param value="#{DatasetPage.restrictedFileCount}"/>
</h:outputFormat>
</p>
</div>
</ui:fragment>
</div>
<div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.termsOfAccess}">
<label for="metadata_TermsAccess" class="col-sm-3 control-label">
Expand All @@ -256,7 +258,7 @@
<p><h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.termsOfAccess)}" escape="false"/></p>
</div>
</div>
<div class="form-group" jsf:rendered="#{!settingsWrapper.publicInstall and (DatasetPage.restrictedFileCount > 0)}">
<div class="form-group" jsf:rendered="#{!settingsWrapper.publicInstall and ( datasetPage == true and DatasetPage.restrictedFileCount > 0)}">
<label for="metadata_RequestAccess" class="col-sm-3 control-label">
#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess']}
<span class="glyphicon glyphicon-question-sign tooltip-icon"
Expand Down
1 change: 1 addition & 0 deletions src/main/webapp/manage-templates.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@
</ui:include>
<ui:include src="dataset-license-terms.xhtml">
<ui:param name="managePage" value="true"/>
<ui:param name="datasetPage" value="false"/>
<ui:param name="termsOfUseAndAccess" value="#{TemplatePage.template.termsOfUseAndAccess}" />
</ui:include>
<div class="button-block">
Expand Down