Note saving, revert buttons in review page
This commit is contained in:
@@ -480,7 +480,7 @@ class Changeset
|
||||
if ($this->isNewColumn($id)) {
|
||||
unset($this->newColumns[$id]);
|
||||
// remove it from order
|
||||
$this->columnOrder = array_diff($this->columnOrder, [$id]);
|
||||
$this->columnOrder = array_values(array_diff($this->columnOrder, [$id]));
|
||||
}
|
||||
else {
|
||||
$this->removedColumns[] = $id;
|
||||
@@ -611,7 +611,7 @@ class Changeset
|
||||
$order = array_intersect($order, $ids);
|
||||
$missing = array_diff($ids, $order);
|
||||
|
||||
$this->columnOrder = array_merge($order, $missing);
|
||||
$this->columnOrder = array_values(array_merge($order, $missing));
|
||||
$this->clearColumnOrderIfUnchanged();
|
||||
}
|
||||
|
||||
@@ -644,10 +644,54 @@ class Changeset
|
||||
->pluck('id')
|
||||
->diff($this->removedColumns)
|
||||
->merge(collect($this->newColumns)->pluck('id'))
|
||||
->all();
|
||||
->values()->all();
|
||||
|
||||
$this->columnOrder = array_values($this->columnOrder);
|
||||
|
||||
if ($expected == $this->columnOrder) {
|
||||
$this->columnOrder = [];
|
||||
}
|
||||
}
|
||||
|
||||
public function resetColumnOrder()
|
||||
{
|
||||
$this->columnOrder = [];
|
||||
}
|
||||
|
||||
public function resetRemovedColumns()
|
||||
{
|
||||
$this->removedColumns = [];
|
||||
}
|
||||
|
||||
public function resetAddedColumns()
|
||||
{
|
||||
$this->columnOrder = array_values(
|
||||
array_diff($this->columnOrder,
|
||||
collect($this->newColumns)->pluck('id')->all()
|
||||
)
|
||||
);
|
||||
|
||||
$this->newColumns = [];
|
||||
$this->clearColumnOrderIfUnchanged();
|
||||
}
|
||||
|
||||
public function resetUpdatedColumns()
|
||||
{
|
||||
$this->columnUpdates = [];
|
||||
}
|
||||
|
||||
public function resetRemovedRows()
|
||||
{
|
||||
$this->removedRows = [];
|
||||
}
|
||||
|
||||
public function resetAddedRows()
|
||||
{
|
||||
$this->newRows = [];
|
||||
}
|
||||
|
||||
public function resetUpdatedRows()
|
||||
{
|
||||
$this->rowUpdates = [];
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user