fix #193

2017-08-08 09:18:24 +01:00 · 2017-08-08 09:18:24 +01:00 · e42ec4b42f
parent 40fda1368a
commit e42ec4b42f
2 changed files with 295 additions and 291 deletions
--- a/assets/src/components/files/Listing.vue
+++ b/assets/src/components/files/Listing.vue
@ -275,6 +275,10 @@ export default {
      this.checkConflict(files, this.req.items, base)
    },
    checkConflict (files, items, base) {
+      if (typeof items === 'undefined' || items === null) {
+        items = []
+      }
+
      let conflict = false
      for (let i = 0; i < files.length; i++) {
        let res = items.findIndex(function hasConflict (element) {
--- a/rice-box.go
+++ b/rice-box.go