From: Robin Appelman <robin@icewind.nl>
Date: Wed, 18 Oct 2017 13:16:51 +0000 (+0200)
Subject: never show '/' as path for conflicting file names
X-Git-Tag: v12.0.4RC1~20^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F6847%2Fhead;p=nextcloud-server.git

never show '/' as path for conflicting file names

Signed-off-by: Robin Appelman <robin@icewind.nl>
---

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 857865c7111..bdd4a6ffc37 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -1214,7 +1214,9 @@
 					if (firstConflictPath.charAt(0) === '/') {
 						firstConflictPath = firstConflictPath.substr(1);
 					}
-					$firstConflict.find('td.filename span.innernametext').prepend($('<span></span>').addClass('conflict-path').text(firstConflictPath));
+					if (firstConflictPath && firstConflictPath !== '/') {
+						$firstConflict.find('td.filename span.innernametext').prepend($('<span></span>').addClass('conflict-path').text(firstConflictPath));
+					}
 				}
 
 				var conflictPath = path + '/';