github
/
filebrowser
mirror of https://github.com/filebrowser/filebrowser
1
0
Fork 0
Code Issues Releases Wiki Activity

fix #193

pull/194/head
Henrique Dias 2017-08-08 09:18:24 +01:00
parent 40fda1368a
commit e42ec4b42f
No known key found for this signature in database
GPG Key ID: 936F5EB68D786730
2 changed files with 295 additions and 291 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/src/components/files/Listing.vue
View File

@ -275,6 +275,10 @@ export default {
this.checkConflict(files, this.req.items, base) this.checkConflict(files, this.req.items, base)
}, },
checkConflict (files, items, base) { checkConflict (files, items, base) {
if (typeof items === 'undefined' || items === null) {
items = []
}
let conflict = false let conflict = false
for (let i = 0; i < files.length; i++) { for (let i = 0; i < files.length; i++) {
let res = items.findIndex(function hasConflict (element) { let res = items.findIndex(function hasConflict (element) {

582
rice-box.go
View File

File diff suppressed because one or more lines are too long