Merge pull request #28 from nick-denry/master

himiklab · web-flow · commit c0126a6a1d6d · 2018-02-06T16:32:04.000+03:00
Set order directly if model sortableAttribute value is null
diff --git a/SortableGridBehavior.php b/SortableGridBehavior.php
@@ -62,7 +62,7 @@ public function gridSort($items)
         $models = [];
         foreach ($items as $old => $new) {
             $models[$new] = $model::findOne($new);
-            $newOrder[$old] = $models[$new]->{$this->sortableAttribute};
+            $newOrder[$old] = $models[$new]->{$this->sortableAttribute} ? $models[$new]->{$this->sortableAttribute} : $new;
         }
         $model::getDb()->transaction(function () use ($models, $newOrder) {
             foreach ($newOrder as $modelId => $orderValue) {

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public function gridSort($items)`
`62`	`62`	`$models = [];`
`63`	`63`	`foreach ($items as $old => $new) {`
`64`	`64`	`$models[$new] = $model::findOne($new);`
`65`		`- $newOrder[$old] = $models[$new]->{$this->sortableAttribute};`
	`65`	`+ $newOrder[$old] = $models[$new]->{$this->sortableAttribute} ? $models[$new]->{$this->sortableAttribute} : $new;`
`66`	`66`	`}`
`67`	`67`	`$model::getDb()->transaction(function () use ($models, $newOrder) {`
`68`	`68`	`foreach ($newOrder as $modelId => $orderValue) {`