fix #193

Former-commit-id: 5765a9c1178a015e036481e6eb78f498bead5b04 [formerly 37680ed0dab2e85b3ac921fbe3fd354a238211f5] [formerly ed9fbac269e054784e5f375c71c6423441667e82 [formerly e42ec4b42f]] Former-commit-id: 5877cfd762b4dc1e6924ae87f136f24c82a98fdc [formerly 65376cc4c37750b9e7efdfae8fe24687a683d057] Former-commit-id: 4063ea78f117a8e3d04a047280e8462c6d5d493e
2017-08-08 09:18:24 +01:00 · 2017-08-08 09:18:24 +01:00 · e464eb69ed
parent b034c87ec0
commit e464eb69ed
2 changed files with 5 additions and 1 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.REMOVED.git-id
+++ b/rice-box.go.REMOVED.git-id
@ -1 +1 @@
-089544d63f4f1d633c2e2baa961a8958d1d768e4
+1f3ae0f4595621cd6a7492418bafc23660342685