Skip to content

Commit

Permalink
#6684 move publish button group logic
Browse files Browse the repository at this point in the history
sekmiller committed Apr 10, 2020
1 parent 5151b4f commit 6f61923
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions src/main/webapp/dataset.xhtml
Original file line number Diff line number Diff line change
@@ -20,6 +20,12 @@
<ui:param name="version" value="#{DatasetPage.workingVersion}"/>
<ui:param name="locked" value="#{DatasetPage.locked}"/>
<ui:param name="showMessagePanel" value="#{true}"/>
<ui:param name="showPublishButtonGroup" value="#{DatasetPage.workingVersion == DatasetPage.dataset.latestVersion
and DatasetPage.dataset.latestVersion.versionState=='DRAFT'
and (permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)
or
(DatasetPage.canUpdateDataset()
and !permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)))}"/>
<ui:define name="meta_header">
<meta name="description" content="#{DatasetPage.description}"/>
</ui:define>
@@ -228,11 +234,7 @@

<!-- PUBLISH DATASET -->
<div class="btn-group btn-group-justified"
jsf:rendered="#{DatasetPage.workingVersion == DatasetPage.dataset.latestVersion
and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)
or (DatasetPage.dataset.latestVersion.versionState=='DRAFT'
and DatasetPage.canUpdateDataset()
and !permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset))}">
jsf:rendered="#{showPublishButtonGroup}">
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
PUBLISH DATASET <span class="caret"></span>

0 comments on commit 6f61923

Please sign in to comment.