Skip to content

Commit ba61257

Browse files
kcondonkcondon
authored
Merge pull request #3922 from IQSS/3578-widgets-file-pg
widgets file pg
2 parents b7754a9 + a461340 commit ba61257

4 files changed

Lines changed: 31 additions & 21 deletions

File tree

‎src/main/webapp/dataset.xhtml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -520,10 +520,10 @@
520520
rendered="#{(!DatasetPage.workingVersion.deaccessioned or (DatasetPage.workingVersion.deaccessioned and DatasetPage.canUpdateDataset()))
521521
and (empty DatasetPage.editMode or DatasetPage.editMode == 'METADATA')}">
522522

523-
<div class="button-block tab-header margin-bottom text-right" jsf:rendered="#{empty DatasetPage.editMode and !widgetWrapper.widgetView}">
523+
<div class="button-block tab-header margin-bottom text-right" jsf:rendered="#{empty DatasetPage.editMode}">
524524
<p:commandLink type="button" styleClass="btn btn-default btn-access" actionListener="#{DatasetPage.edit('METADATA')}" update="@form,:messagePanel" oncomplete="javascript:post_edit_metadata()"
525-
disabled="#{DatasetPage.locked}" rendered="#{DatasetPage.sessionUserAuthenticated and empty DatasetPage.editMode and !widgetWrapper.widgetView
526-
and DatasetPage.canUpdateDataset() and !DatasetPage.dataset.deaccessioned }">
525+
disabled="#{DatasetPage.locked}" rendered="#{!widgetWrapper.widgetView and (DatasetPage.sessionUserAuthenticated and empty DatasetPage.editMode and !widgetWrapper.widgetView
526+
and DatasetPage.canUpdateDataset() and !DatasetPage.dataset.deaccessioned)}">
527527
<f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="0" />
528528
<span class="glyphicon glyphicon-pencil"/> #{bundle['file.dataFilesTab.metadata.addBtn']}
529529
</p:commandLink>

‎src/main/webapp/file-versions.xhtml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,18 @@
88
xmlns:o="http://omnifaces.org/ui"
99
xmlns:jsf="http://xmlns.jcp.org/jsf">
1010

11+
<ui:fragment rendered="#{widgetWrapper.widgetView}">
12+
<p class="help-block">
13+
<span class="glyphicon glyphicon-info-sign"/>
14+
<h:outputFormat value=" #{bundle['file.dataFilesTab.versions.widget.viewMoreInfo']}" escape="false">
15+
<f:param value="#{FilePage.fileMetadata.datasetVersion.dataset.globalId}"/>
16+
<f:param value="#{FilePage.fileMetadata.datasetVersion.dataset.displayName}"/>
17+
<f:param value="#{dataverseServiceBean.findRootDataverse().displayName}"/>
18+
</h:outputFormat>
19+
</p>
20+
</ui:fragment>
21+
22+
<ui:fragment rendered="#{!widgetWrapper.widgetView}">
1123
<!-- VERSIONS -->
1224
<script type="text/javascript">
1325
/* Version tab: Retrieve data after page load */
@@ -128,4 +140,5 @@
128140
<!-- end: date column -->
129141
</p:dataTable>
130142
<!-- / VERSIONS -->
143+
</ui:fragment>
131144
</ui:composition>

‎src/main/webapp/file.xhtml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<div id="topDatasetBlock" class="row">
3030
<div id="actionButtonBlock" class="col-xs-12">
3131
<!-- Metrics -->
32-
<div id="metrics-block" class="col-xs-3" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
32+
<div id="metrics-block" class="col-xs-3" jsf:rendered="#{!widgetWrapper.widgetView and !FilePage.fileMetadata.datasetVersion.deaccessioned}">
3333
<div id="metrics-label" class="col-xs-4 small text-center">
3434
<span class="glyphicon glyphicon-stats"/> #{bundle['metrics.title']}
3535
</div>
@@ -43,7 +43,7 @@
4343

4444
<div class="button-block pull-right">
4545
<!-- Email/Share Button Group -->
46-
<div class="btn-group" id="datasetButtonBar" role="group">
46+
<div class="btn-group" id="datasetButtonBar" role="group" jsf:rendered="#{!widgetWrapper.widgetView}">
4747
<p:commandLink class="text-button bootstrap-button-tooltip" title="#{bundle['dataset.email.datasetContactBtn']}"
4848
update=":contactDialog" oncomplete="PF('contactForm').show()" actionListener="#{sendFeedbackDialog.initUserInput}">
4949
<f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
@@ -71,7 +71,7 @@
7171
</p:dialog>
7272
<!-- END: Email/Share Button Group -->
7373

74-
<div class="button-container btn-group">
74+
<div class="button-container btn-group" jsf:rendered="#{!widgetWrapper.widgetView}">
7575
<!-- Map Data/Set Up Button Block -->
7676
<ui:fragment rendered="#{(worldMapPermissionHelper.canUserSeeMapDataButtonFromPage(fileMetadata) or worldMapPermissionHelper.canSeeMapButtonReminderToPublishFromPage(fileMetadata))
7777
or (!FilePage.fileMetadata.datasetVersion.deaccessioned or
@@ -278,14 +278,14 @@
278278
<!-- Add + Edit Metadata Button -->
279279
<div class="button-block tab-header margin-bottom text-right">
280280
<h:outputLink class="btn btn-default btn-access" value="/editdatafiles.xhtml?selectedFileIds=#{FilePage.fileMetadata.dataFile.id}&#38;datasetId=#{FilePage.fileMetadata.datasetVersion.dataset.id}&#38;mode=SINGLE"
281-
rendered="#{dataverseSession.user.authenticated
281+
rendered="#{!widgetWrapper.widgetView and (dataverseSession.user.authenticated
282282
and permissionsWrapper.canIssueUpdateDatasetCommand(FilePage.fileMetadata.datasetVersion.dataset)
283-
and !(dataFileServiceBean.hasReplacement(FilePage.fileMetadata.dataFile) or dataFileServiceBean.hasBeenDeleted(FilePage.fileMetadata.dataFile))}">
283+
and !(dataFileServiceBean.hasReplacement(FilePage.fileMetadata.dataFile) or dataFileServiceBean.hasBeenDeleted(FilePage.fileMetadata.dataFile)))}">
284284
<span class="glyphicon glyphicon-pencil"/> #{bundle['file.dataFilesTab.metadata.addBtn']}
285285
</h:outputLink>
286-
<div class="btn-group" jsf:rendered="#{dataverseSession.user.authenticated
286+
<div class="btn-group" jsf:rendered="#{!widgetWrapper.widgetView and (dataverseSession.user.authenticated
287287
and permissionsWrapper.canIssueUpdateDatasetCommand(FilePage.fileMetadata.datasetVersion.dataset)
288-
and (dataFileServiceBean.hasReplacement(FilePage.fileMetadata.dataFile) or dataFileServiceBean.hasBeenDeleted(FilePage.fileMetadata.dataFile)) }">
288+
and (dataFileServiceBean.hasReplacement(FilePage.fileMetadata.dataFile) or dataFileServiceBean.hasBeenDeleted(FilePage.fileMetadata.dataFile)))}">
289289
<p:commandLink styleClass="btn btn-default btn-access" onclick="PF('fileAlreadyReplacedPrevious').show()">
290290
<span class="glyphicon glyphicon-pencil"/> #{bundle['dataset.editBtn']}
291291
</p:commandLink>

‎src/main/webapp/filesFragment.xhtml‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -206,14 +206,13 @@
206206

207207
<ui:fragment rendered="#{fileMetadata.datasetVersion.released or ((fileMetadata.datasetVersion.deaccessioned or fileMetadata.datasetVersion.draft)
208208
and permissionServiceBean.on(DatasetPage.dataset).has('ViewUnpublishedDataset'))}">
209-
<ui:fragment rendered="#{!(fileMetadata.datasetVersion.released or fileMetadata.datasetVersion.deaccessioned)}">
210-
<a id="fileNameLink" href="/file.xhtml?fileId=#{fileMetadata.dataFile.id}&#38;version=#{fileMetadata.datasetVersion.versionState}" class="ui-commandlink ui-widget">
211-
<h:outputText value="#{fileMetadata.label}" /></a>
212-
</ui:fragment>
213-
<ui:fragment rendered="#{(fileMetadata.datasetVersion.released or fileMetadata.datasetVersion.deaccessioned)}">
214-
<a id="fileNameLink" href="/file.xhtml?fileId=#{fileMetadata.dataFile.id}&#38;version=#{fileMetadata.datasetVersion.versionNumber}.#{fileMetadata.datasetVersion.minorVersionNumber}" class="ui-commandlink ui-widget">
215-
<h:outputText value="#{fileMetadata.label}" /></a>
216-
</ui:fragment>
209+
<!-- rendered="# {!(fileMetadata.datasetVersion.released or fileMetadata.datasetVersion.deaccessioned)}" -->
210+
<h:outputLink id="fileNameLink" value="#{widgetWrapper.wrapURL('/file.xhtml')}">
211+
<f:param name="fileId" value="#{fileMetadata.dataFile.id}" />
212+
<f:param name="version" value="#{fileMetadata.datasetVersion.versionState}" />
213+
<f:param name="version" rendered="#{(fileMetadata.datasetVersion.released or fileMetadata.datasetVersion.deaccessioned)}" value=".#{fileMetadata.datasetVersion.minorVersionNumber}" />
214+
<h:outputText value="#{fileMetadata.label}" />
215+
</h:outputLink>
217216
</ui:fragment>
218217

219218
<!-- TYPE + SIZE + DATE + CHECKSUM -->
@@ -263,8 +262,6 @@
263262

264263
</p:column>
265264
<p:column class="col-file-action text-right" rendered="#{!(DatasetPage.editMode == 'FILE' or DatasetPage.editMode == 'CREATE')}">
266-
267-
268265
<f:facet name="header" class="col-file-action text-right">
269266
<!-- EDIT -->
270267
<div style="margin-right:14px;" class="btn-group" jsf:rendered="#{DatasetPage.sessionUserAuthenticated
@@ -345,7 +342,7 @@
345342
#{bundle['file.ingestInProgress']}
346343
</div>
347344

348-
<ui:fragment rendered="#{worldMapPermissionHelper.canUserSeeMapDataButtonFromPage(fileMetadata) or worldMapPermissionHelper.canSeeMapButtonReminderToPublishFromPage(fileMetadata)}">
345+
<ui:fragment rendered="#{!widgetWrapper.widgetView and (worldMapPermissionHelper.canUserSeeMapDataButtonFromPage(fileMetadata) or worldMapPermissionHelper.canSeeMapButtonReminderToPublishFromPage(fileMetadata))}">
349346
<ui:include src="file-setup-button.xhtml">
350347
<ui:param name="fileMetadata" value="#{fileMetadata}"/>
351348
<ui:param name="canUpdateDataset" value="#{DatasetPage.canUpdateDataset()}"/>

0 commit comments

Comments
 (0)
⚡