fix CSV import asking for cols that were removed

2018-08-11 18:59:09 +02:00
parent bc960e80aa
commit 2cadbdcd31
2 changed files with 4 additions and 2 deletions
@@ -129,7 +129,7 @@ class TableEditController extends Controller
        return view('table.propose.add-rows-csv', [
            'changeset' => $changeset,
            'table' => $changeset->table,
-            'columns' => collect($columns),
+            'columns' => collect($columns)->where('toRemove', false),
        ]);
    }

@@ -643,8 +643,10 @@ class Changeset
     */
    public function addFilledRows($csvArray)
    {
+        $columns = collect($this->fetchAndTransformColumns())->where('toRemove', false);
+
        /** @var Column[] $columns */
-        $columns = array_values($this->fetchAndTransformColumns());
+        $columns = $columns->values()->all();

        $rows = self::csvToRowsArray($columns, $csvArray, false, true)
            ->keyBy('_id');