From: Marcin Haba <marcin.haba@bacula.pl>
Date: Sun, 16 Sep 2018 18:55:10 +0000 (+0200)
Subject: baculum: Fix size unit formatters in restore browser reported by Wanderlei Huttel
X-Git-Tag: Release-9.2.2~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=772c6c4dfc81857bcc69833fd6eb875b252d0c0e;p=thirdparty%2Fbacula.git

baculum: Fix size unit formatters in restore browser reported by Wanderlei Huttel
---

diff --git a/gui/baculum/protected/Web/JavaScript/misc.js b/gui/baculum/protected/Web/JavaScript/misc.js
index 3f646cd36..fdcfd57c7 100644
--- a/gui/baculum/protected/Web/JavaScript/misc.js
+++ b/gui/baculum/protected/Web/JavaScript/misc.js
@@ -90,9 +90,9 @@ var Formatters = {
 	],
 	set_formatters: function() {
 		var elements, formatter, txt, val;
-		for (var i = 0; i < this.formatter.length; i++) {
-			elements = document.getElementsByClassName(this.formatter[i].css_class);
-			formatter = this.formatter[i].format_func;
+		for (var i = 0; i < Formatters.formatter.length; i++) {
+			elements = document.getElementsByClassName(Formatters.formatter[i].css_class);
+			formatter = Formatters.formatter[i].format_func;
 			for (var j = 0; j < elements.length; j++) {
 				txt = elements[j].firstChild;
 				if (txt && txt.nodeType === 3) {
diff --git a/gui/baculum/protected/Web/Pages/RestoreWizard.page b/gui/baculum/protected/Web/Pages/RestoreWizard.page
index 772995e79..9a31a8eb7 100644
--- a/gui/baculum/protected/Web/Pages/RestoreWizard.page
+++ b/gui/baculum/protected/Web/Pages/RestoreWizard.page
@@ -394,6 +394,7 @@ oJobsToRestoreList.init();
 													var ocf = request.options.onComplete;
 													request.options.onComplete = function() {
 														ocf();
+														Formatters.set_formatters();
 														make_draggable();
 													};
 													request.dispatch();
@@ -477,6 +478,7 @@ oJobsToRestoreList.init();
 								Options.accept=".draggable"
 								OnDrop="addFileToRestore"
 								OnCallback="refreshSelectedFiles"
+								OnDeactivate="callFormatters"
 								>
 									<com:TActiveDataGrid
 										ID="SelectedVersionsDataGrid"
@@ -528,6 +530,7 @@ oJobsToRestoreList.init();
 					});
 				}
 				make_draggable('<%=$this->getPage()->DataGridFiles->ClientID%>');
+				Formatters.set_formatters();
 			</script>
 		</com:TWizardStep>
 		<com:TWizardStep ID="Step4" Title="<%[ Step 4 - select destination for restore ]%>" StepType="Auto">
diff --git a/gui/baculum/protected/Web/Pages/RestoreWizard.php b/gui/baculum/protected/Web/Pages/RestoreWizard.php
index e01ed8c86..ecb4cda8c 100644
--- a/gui/baculum/protected/Web/Pages/RestoreWizard.php
+++ b/gui/baculum/protected/Web/Pages/RestoreWizard.php
@@ -571,6 +571,13 @@ class RestoreWizard extends BaculumWebPage
 		$this->SelectedVersionsDropper->render($param->NewWriter);
 	}
 
+	/**
+	 * Call formatters method.
+	 */
+	public function callFormatters($sender, $param) {
+		$this->getCallbackClient()->callClientFunction('Formatters.set_formatters');
+	}
+
 	/*
 	 * Load file browser files to list.
 	 *