]> git.ipfire.org Git - thirdparty/bacula.git/commitdiff
baculum: Fix size unit formatters in restore browser reported by Wanderlei Huttel
authorMarcin Haba <marcin.haba@bacula.pl>
Sun, 16 Sep 2018 18:55:10 +0000 (20:55 +0200)
committerMarcin Haba <marcin.haba@bacula.pl>
Sun, 16 Sep 2018 19:27:39 +0000 (21:27 +0200)
gui/baculum/protected/Web/JavaScript/misc.js
gui/baculum/protected/Web/Pages/RestoreWizard.page
gui/baculum/protected/Web/Pages/RestoreWizard.php

index 3f646cd363064096aabfeb3d69d1bd8959ff5412..fdcfd57c70dc3425dbc6d5e97d2bc0392989993b 100644 (file)
@@ -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) {
index 772995e793d6ec1daf3e4d4e29ffb8ea5eb7d251..9a31a8eb74a32276dd5f84c89f25569f0aea6b79 100644 (file)
@@ -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">
index e01ed8c860647d870d6cb12d47836c2894bdd86f..ecb4cda8c80d1331930706a39231eca36e601d0d 100644 (file)
@@ -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.
         *