Skip to content

Commit

Permalink
Merge pull request IQSS#7454 from IQSS/7450-delete-file-fix
Browse files Browse the repository at this point in the history
fix delete bug by renaming edit delete confirmation widgetvar
  • Loading branch information
kcondon authored Dec 4, 2020
2 parents b5b96fc + 98ec503 commit 9107a96
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/main/webapp/editFilesFragment.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -579,15 +579,15 @@
</button>
</div>
</p:dialog>
<p:dialog id="deleteFileConfirmDialog" styleClass="smallPopUp" header="#{bundle['file.deleteFileDialog.header']}" widgetVar="deleteFileConfirmation" modal="true">
<p:dialog id="deleteFileConfirmDialog" styleClass="smallPopUp" header="#{bundle['file.deleteFileDialog.header']}" widgetVar="editDeleteFileConfirmation" modal="true">
<p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['file.deleteFileDialog.tip']}</p>
<ui:fragment rendered="#{EditDatafilesPage.dataset.released}">
<p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['file.deleteFileDialog.failed.tip']}</p>
</ui:fragment>
<div class="button-block">
<p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('deleteFileConfirmation').hide()" oncomplete="window.scrollTo(0, 0);deleteFinished();bind_bsui_components();"
<p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('editDeleteFileConfirmation').hide()" oncomplete="window.scrollTo(0, 0);deleteFinished();bind_bsui_components();"
update=":#{p:resolveClientId('datasetForm:filesTable', view)},:messagePanel,:#{p:resolveClientId('datasetForm:fileUpload', view)},uploadMessage" action="#{EditDatafilesPage.deleteFiles()}"/>
<button class="btn btn-link" onclick="PF('deleteFileConfirmation').hide();bind_bsui_components();" type="button">
<button class="btn btn-link" onclick="PF('editDeleteFileConfirmation').hide();bind_bsui_components();" type="button">
#{bundle.cancel}
</button>
</div>
Expand Down Expand Up @@ -947,7 +947,7 @@
function checkFilesSelected() {
var count = PF('filesTable').getSelectedRowsCount();
if (count > 0) {
PF('deleteFileConfirmation').show();
PF('editDeleteFileConfirmation').show();
} else {
PF('selectFilesForDeleteFragment').show();
}
Expand Down

0 comments on commit 9107a96

Please sign in to comment.