From: Eric Bollengier <eric@baculasystems.com>
Date: Thu, 17 Nov 2011 08:55:01 +0000 (+0100)
Subject: bweb: try to handle windows drive better in bresto
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0306d6002586cfe166f6faa569c0d31f14bc6d51;p=bacula%2Fbacula

bweb: try to handle windows drive better in bresto
---

diff --git a/gui/bweb/html/bresto.js b/gui/bweb/html/bresto.js
index 5e62f464d5..d9fb76e924 100644
--- a/gui/bweb/html/bresto.js
+++ b/gui/bweb/html/bresto.js
@@ -444,8 +444,10 @@ Ext.onReady(function(){
 
            if (r.json[4] == '..') {
               Ext.brestore.path = dirname(Ext.brestore.path);
-           } else if (r.json[4] == '/') {
+           } else if (r.json[4] == '/') {                // unix root
               Ext.brestore.path = '/';
+           } else if (r.json[4].match('^[a-zA-Z]:/$')) { // windows drive
+              Ext.brestore.path = r.json[4];
            } else if (r.json[4] != '.') {
               Ext.brestore.path = Ext.brestore.path + r.json[4];
            }
@@ -961,7 +963,7 @@ Ext.onReady(function(){
                     for(var i=0;i<data.selections.length;i++) {
                         var name = data.selections[i].json[4];
                         var fnid = data.selections[i].json[1];
-                        if (fnid == 0 && name != '..') {
+                        if (fnid == 0 && name != '..' && !name.match('/$')) {
                             name = name + '/';
                         }
                         r = new file_selection_record({