From 41478002667a071cec4d2adbf4e8246505dbda4b Mon Sep 17 00:00:00 2001
From: Pierre Donias <pierre.donias@gmail.com>
Date: Mon, 24 Sep 2018 10:52:48 +0200
Subject: [PATCH]  fix(xo-web/file-restore): ensure folder path trailing slash 
 (#3446)

---
 CHANGELOG.md                                                  | 2 ++
 .../src/xo-app/backup-ng/file-restore/restore-file-modal.js   | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fdd26febd..7521054e6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@
 
 ### Bug fixes
 
+[File restore] Fix a path issue when going back to the parent folder (PR [#3446](https://github.com/vatesfr/xen-orchestra/pull/3446))
+
 ### Released packages
 
 - xo-server v5.28.0
diff --git a/packages/xo-web/src/xo-app/backup-ng/file-restore/restore-file-modal.js b/packages/xo-web/src/xo-app/backup-ng/file-restore/restore-file-modal.js
index 2adea5d38..8926892b3 100644
--- a/packages/xo-web/src/xo-app/backup-ng/file-restore/restore-file-modal.js
+++ b/packages/xo-web/src/xo-app/backup-ng/file-restore/restore-file-modal.js
@@ -46,6 +46,8 @@ const fileOptionRenderer = ({ isFile, name }) => (
   </span>
 )
 
+const ensureTrailingSlash = path => path + (endsWith(path, '/') ? '' : '/')
+
 // -----------------------------------------------------------------------------
 
 const formatFilesOptions = (rawFiles, path) => {
@@ -56,7 +58,7 @@ const formatFilesOptions = (rawFiles, path) => {
             id: '..',
             isFile: false,
             name: '..',
-            path: dirname(path),
+            path: ensureTrailingSlash(dirname(path)),
           },
         ]
       : []