fix CSV import asking for cols that were removed
This commit is contained in:
@@ -129,7 +129,7 @@ class TableEditController extends Controller
|
|||||||
return view('table.propose.add-rows-csv', [
|
return view('table.propose.add-rows-csv', [
|
||||||
'changeset' => $changeset,
|
'changeset' => $changeset,
|
||||||
'table' => $changeset->table,
|
'table' => $changeset->table,
|
||||||
'columns' => collect($columns),
|
'columns' => collect($columns)->where('toRemove', false),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -643,8 +643,10 @@ class Changeset
|
|||||||
*/
|
*/
|
||||||
public function addFilledRows($csvArray)
|
public function addFilledRows($csvArray)
|
||||||
{
|
{
|
||||||
|
$columns = collect($this->fetchAndTransformColumns())->where('toRemove', false);
|
||||||
|
|
||||||
/** @var Column[] $columns */
|
/** @var Column[] $columns */
|
||||||
$columns = array_values($this->fetchAndTransformColumns());
|
$columns = $columns->values()->all();
|
||||||
|
|
||||||
$rows = self::csvToRowsArray($columns, $csvArray, false, true)
|
$rows = self::csvToRowsArray($columns, $csvArray, false, true)
|
||||||
->keyBy('_id');
|
->keyBy('_id');
|
||||||
|
|||||||
Reference in New Issue
Block a user