From: Marcin Haba <marcin.haba@bacula.pl>
Date: Sun, 21 Jul 2019 12:36:09 +0000 (+0200)
Subject: baculum: Fix removing items from selected file browser in restore wizard
X-Git-Tag: Release-9.6.0~186
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=058b7b79a024be5b6991b67aaf14af28192fa201;p=thirdparty%2Fbacula.git

baculum: Fix removing items from selected file browser in restore wizard
---

diff --git a/gui/baculum/protected/Web/Pages/RestoreWizard.page b/gui/baculum/protected/Web/Pages/RestoreWizard.page
index 8f20e19978..63b3a55f4c 100644
--- a/gui/baculum/protected/Web/Pages/RestoreWizard.page
+++ b/gui/baculum/protected/Web/Pages/RestoreWizard.page
@@ -474,6 +474,18 @@ oJobsToRestoreList.init();
 				<tr>
 					<td style="vertical-align: bottom;">
 						<div id="restore-browser-selected" class="w3-border">
+							<com:TCallback
+								ID="RemoveSelectedItem"
+								OnCallback="removeSelectedFile"
+								ClientSide.OnComplete="set_formatters();"
+							/>
+							<script type="text/javascript">
+								function remove_selected_item(fileid) {
+									var cb = <%=$this->RemoveSelectedItem->ActiveControl->Javascript%>;
+									cb.setCallbackParameter(fileid);
+									cb.dispatch();
+								}
+							</script>
 							<com:TJuiDroppable ID="SelectedVersionsDropper" Height="100%" Width="100%"
 								Options.accept=".draggable"
 								OnDrop="addFileToRestore"
@@ -505,7 +517,7 @@ oJobsToRestoreList.init();
 													</span>
 													<span class="w3-third">
 														<%[ Size: ]%><span class="size"><%=$this->getParent()->Data['lstat']['size']%></span>
-														<com:TActiveImageButton CssClass="w3-right" ImageUrl="<%=$this->getPage()->getTheme()->getBaseUrl()%>/icon_close.png" OnCallback="Page.removeSelectedFile" ActiveControl.CallbackParameter="<%=isset($this->getParent()->Data['fileid']) ? $this->getParent()->Data['fileid'] : ''%>"/>
+														<input type="image" src="<%=$this->getPage()->getTheme()->getBaseUrl()%>/icon_close.png" alt="" class="w3-right" onclick="remove_selected_item('<%=isset($this->getParent()->Data['fileid']) ? $this->getParent()->Data['fileid'] : ''%>'); return false;">
 													</span>
 												</com:TPanel>
 										</prop:ItemTemplate>
diff --git a/gui/baculum/protected/Web/Pages/RestoreWizard.php b/gui/baculum/protected/Web/Pages/RestoreWizard.php
index 483d8f626e..ee92eaad32 100644
--- a/gui/baculum/protected/Web/Pages/RestoreWizard.php
+++ b/gui/baculum/protected/Web/Pages/RestoreWizard.php
@@ -26,7 +26,6 @@ Prado::using('System.Web.UI.WebControls.TWizard');
 Prado::using('System.Web.UI.WebControls.TDataGrid');
 Prado::using('System.Web.UI.JuiControls.TJuiDroppable');
 Prado::using('System.Web.UI.ActiveControls.TActiveLinkButton');
-Prado::using('System.Web.UI.ActiveControls.TActiveImageButton');
 Prado::using('System.Web.UI.ActiveControls.TActiveDataGrid');
 Prado::using('System.Web.UI.ActiveControls.TActiveRepeater');
 Prado::using('System.Web.UI.ActiveControls.TCallback');
@@ -535,7 +534,7 @@ class RestoreWizard extends BaculumWebPage
 	/**
 	 * Remove file from files marked to restre.
 	 *
-	 * @param TActiveImageButton $sender remove button object
+	 * @param TCallback $sender sender object
 	 * @param TEventParameter $param param object
 	 * @return none
 	 */