Merge pull request #1337 from cassproject/ce-1336

Specify CTID to replace references with when skipping duplicates
cassproject · Oct 18, 2023 · 82e8097 · 82e8097
2 parents f8494d0 + c3a7ebd
commit 82e8097
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/components/import/ImportFile.vue b/src/components/import/ImportFile.vue
@@ -552,10 +552,9 @@ export default {
                 if (set !== 'upload all') {
                     this.duplicateSets[i].duplicates.forEach((duplicate) => {
                         if (duplicate.ctid !== set && !duplicate.ctid.includes('upload all')) {
-                            skip.push(duplicate.ctid);
-                            if (duplicate.replaceWith) {
-                                // Replace all instances of duplicate.ctid with duplicate.replaceWith in import file
-                            }
+                            skip.push({
+                                ctid: duplicate.ctid,
+                                replaceWith: set});
                         }
                     });
                 }

diff --git a/src/lode/components/ThingEditing.vue b/src/lode/components/ThingEditing.vue
@@ -1324,7 +1324,7 @@ export default {
                             me.spitEvent('viewChanged');
                         }
                     } catch (ex) {
-                        appError(err);
+                        appError(ex);
                         me.errorSaving = true;
                     }
                 }