Skip to content

5958 rogue dataset popup btns #5968

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
Jun 25, 2019
Merged

5958 rogue dataset popup btns #5968

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
891a2fc
Changed button back to p:commandLink component to fix rogue popup btn…
mheppler Jun 24, 2019
08858f8
Fixed render logic for buttons on dataset pg to remove problematic js…
mheppler Jun 24, 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
9 changes: 5 additions & 4 deletions src/main/webapp/dataset-versions.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,11 @@
update=":#{p:resolveClientId('datasetForm:tabView:versionsTable', view)}"
actionListener="#{DatasetPage.postLoadSetVersionTabList()}" />
<div class="text-right margin-bottom">
<button type="button" class="btn btn-default" onclick="testCheckBoxes();"
jsf:rendered="#{DatasetPage.compareVersionsCount > 2}">
<span class="glyphicon glyphicon-transfer"/> #{bundle['file.dataFilesTab.versions.viewDiffBtn']}
</button>
<ui:fragment rendered="#{DatasetPage.compareVersionsCount > 2}">
<button type="button" class="btn btn-default" onclick="testCheckBoxes();">
<span class="glyphicon glyphicon-transfer"/> #{bundle['file.dataFilesTab.versions.viewDiffBtn']}
</button>
</ui:fragment>
<p:commandButton value="#{bundle['file.dataFilesTab.button.direct']}" id="compareVersions"
style="display:none"
update=":datasetForm"
Expand Down
33 changes: 17 additions & 16 deletions src/main/webapp/dataset.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,28 +177,29 @@
<span class="glyphicon glyphicon-globe"/> #{bundle['dataset.publish.btn']}
</p:commandLink>
<!-- END: Publish Buttons -->

<!-- Return to Author Button -->
<button type="button" class="btn btn-default btn-access #{(DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview) ? 'disabled' : ''}"
onclick="PF('sendBackToContributor').show()"
jsf:rendered="#{DatasetPage.dataset.latestVersion.versionState=='DRAFT' and DatasetPage.dataset.latestVersion.inReview

<ui:fragment rendered="#{DatasetPage.dataset.latestVersion.versionState=='DRAFT' and DatasetPage.dataset.latestVersion.inReview
and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
<span class="glyphicon glyphicon-repeat"/> #{bundle['dataset.rejectBtn']}
</button>
<!-- END: Return to Author Button -->
<!-- Return to Author Button -->
<button type="button" class="btn btn-default btn-access #{(DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview) ? 'disabled' : ''}"
onclick="PF('sendBackToContributor').show()">
<span class="glyphicon glyphicon-repeat"/> #{bundle['dataset.rejectBtn']}
</button>
<!-- END: Return to Author Button -->
</ui:fragment>

<!-- Submit for Review Button -->
<button type="button" class="btn btn-default btn-access #{DatasetPage.dataset.latestVersion.inReview or DatasetPage.dataset.locked ? 'disabled' : ''}"
onclick="PF('inreview').show()"
jsf:rendered="#{DatasetPage.workingVersion == DatasetPage.dataset.latestVersion
<ui:fragment rendered="#{DatasetPage.workingVersion == DatasetPage.dataset.latestVersion
and !DatasetPage.datasetLockedInWorkflow
and DatasetPage.dataset.latestVersion.versionState=='DRAFT'
and DatasetPage.canUpdateDataset()
and !permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
<span class="glyphicon glyphicon-globe"/> #{DatasetPage.dataset.latestVersion.inReview ? bundle['dataset.disabledSubmittedBtn'] : bundle['dataset.submitBtn']}
</button>

<!-- End: Submit for Review Button -->
<!-- Submit for Review Button -->
<button type="button" class="btn btn-default btn-access #{DatasetPage.dataset.latestVersion.inReview or DatasetPage.dataset.locked ? 'disabled' : ''}"
onclick="PF('inreview').show()">
<span class="glyphicon glyphicon-globe"/> #{DatasetPage.dataset.latestVersion.inReview ? bundle['dataset.disabledSubmittedBtn'] : bundle['dataset.submitBtn']}
</button>
<!-- End: Submit for Review Button -->
</ui:fragment>
</ui:fragment>
<!-- END: Publish/Submit for Review/Return to Author Button Group -->

Expand Down