Skip to content

only render edit files when hasValidTermsOfAccess #8742 #8863

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 3, 2022
Merged

only render edit files when hasValidTermsOfAccess #8742 #8863

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
d313df4
only render edit files when hasValidTermsOfAccess #8742
pdurbin Jul 27, 2022
c73afdd
Merge branch 'develop' into 8742-valid-toa #8742
pdurbin Aug 3, 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
1 change: 1 addition & 0 deletions src/main/webapp/file.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@
</div>
<div class="btn-group" jsf:rendered="#{dataverseSession.user.authenticated
and permissionsWrapper.canIssueUpdateDatasetCommand(FilePage.fileMetadata.datasetVersion.dataset)
and FilePage.hasValidTermsOfAccess
and !FilePage.deletedFile}">
<button type="button" id="editFile" class="btn btn-default btn-access btn-edit dropdown-toggle #{FilePage.lockedFromEdits ? 'disabled' : ''}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
disabled="#{FilePage.lockedFromEdits ? 'disabled' : ''}">
Expand Down
2 changes: 2 additions & 0 deletions src/main/webapp/filesFragment.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,6 +537,7 @@
<div class="btn-group" jsf:rendered="#{!widgetWrapper.widgetView
and DatasetPage.sessionUserAuthenticated
and DatasetPage.canUpdateDataset()
and DatasetPage.hasValidTermsOfAccess
and DatasetPage.isFileDeleted(fileMetadata.dataFile)}">
<a type="button" class="btn-file-options btn btn-link bootstrap-button-tooltip dropdown-toggle #{DatasetPage.lockedFromEdits ? 'disabled' : ''}"
disabled="#{DatasetPage.lockedFromEdits ? 'disabled' : ''}"
Expand All @@ -548,6 +549,7 @@
<div class="btn-group" jsf:rendered="#{!widgetWrapper.widgetView
and DatasetPage.sessionUserAuthenticated
and DatasetPage.canUpdateDataset()
and DatasetPage.hasValidTermsOfAccess
and !DatasetPage.isFileDeleted(fileMetadata.dataFile)}">
<!-- Kebab / Edit / File Options Dropdown -->
<a type="button" class="btn-file-options btn btn-link bootstrap-button-tooltip dropdown-toggle #{DatasetPage.lockedFromEdits ? 'disabled' : ''}"
Expand Down