diff options
| author | Robin Appelman <robin@icewind.nl> | 2017-10-18 15:16:51 +0200 |
|---|---|---|
| committer | Robin Appelman <robin@icewind.nl> | 2017-11-07 15:01:56 +0100 |
| commit | 8eaf1956bb7eac4c948990f889850834b0df4b0e (patch) | |
| tree | fff7e45d7411c08799a06cb1572b5e84fe677a8a /apps/files | |
| parent | 7ea06dacb112e5921d9decaa0e7db14e9a8acc20 (diff) | |
| download | nextcloud-server-8eaf1956bb7eac4c948990f889850834b0df4b0e.tar.gz nextcloud-server-8eaf1956bb7eac4c948990f889850834b0df4b0e.zip | |
never show '/' as path for conflicting file names
Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'apps/files')
| -rw-r--r-- | apps/files/js/filelist.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 1d2afc74de9..68a450e9130 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -1259,7 +1259,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 + '/'; |