Skip to content

6283 edit files popup #6370

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 3 commits into from
Nov 15, 2019
Merged

6283 edit files popup #6370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
18a5de9
Merge branch 'develop' into 6283-edit-files-popup
sekmiller Nov 12, 2019
e6f2e52
#6283 Add select popups to Edit Files page
sekmiller Nov 14, 2019
38cc27e
Merge branch 'develop' into 6283-edit-files-popup
sekmiller Nov 14, 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
10 changes: 10 additions & 0 deletions src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,6 +729,16 @@ public void setShowAccessPopup(boolean showAccessPopup) {} // dummy set method
//fails silently. This is because they are only granted editDataset permissions
//for that scope after the creation is completed. -Matthew 4.7.1
public void restrictFiles(boolean restricted) throws UnsupportedOperationException{

//First make sure they've even selected file(s) to restrict....
if (this.getSelectedFiles().isEmpty()) {
if (restricted) {
PrimeFaces.current().executeScript("PF('selectFilesForRestrictEditFilesPage').show()");
} else {
PrimeFaces.current().executeScript("PF('selectFilesForUnRestrictEditFilesPage').show()");
}
return;
}

// since we are restricted files, first set the previously restricted file list, so we can compare for
// determining whether to show the access popup
Expand Down
18 changes: 18 additions & 0 deletions src/main/webapp/editdatafiles.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,24 @@
</div>
</ui:fragment>
<!-- END: Create/Save Dataset Button Panel -->
<p:dialog id="selectFilesForRestrictEditFilesPage" styleClass="smallPopUp"
header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectFilesForRestrictEditFilesPage" modal="true">
<p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataset.noSelectedFilesForRestrict']}</p>
<div class="button-block">
<button class="btn btn-default" onclick="PF('selectFilesForRestrictEditFilesPage').hide();" type="button">
#{bundle.close}
</button>
</div>
</p:dialog>
<p:dialog id="selectFilesForUnRestrictEditFilesPage" styleClass="smallPopUp"
header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectFilesForUnRestrictEditFilesPage" modal="true">
<p class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataset.noSelectedFilesForUnRestrict']}</p>
<div class="button-block">
<button class="btn btn-default" onclick="PF('selectFilesForUnRestrictEditFilesPage').hide();" type="button">
#{bundle.close}
</button>
</div>
</p:dialog>
</h:form>

<p:blockUI block="datasetForm" widgetVar="blockFileForm"/>
Expand Down