Again support for URL

grid/columns/ActionColumn.php

@@ -5,6 +5,7 @@
 use Closure;
 use Yii;
 use yii\helpers\Html;
+use yii\helpers\Url;
 use yz\admin\helpers\Rbac;
 use yz\admin\helpers\RouteNormalizer;
 use yz\icons\Icons;
@@ -18,7 +19,6 @@ class ActionColumn extends \yii\grid\ActionColumn
     /**
      * Indicates whether to add return URL to the default buttons
      * @var bool
-     * @deprecated
      */
     public $addReturnUrl = true;
     /**
@@ -107,4 +107,22 @@ protected function checkAccessInternal($action, $model, $key, $index)
             return $this->checkAccess($action, $model, $key, $index);
         }
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function createUrl($action, $model, $key, $index)
+    {
+        if (is_callable($this->urlCreator)) {
+            return call_user_func($this->urlCreator, $action, $model, $key, $index);
+        } else {
+            $params = is_array($key) ? $key : ['id' => (string) $key];
+            if ($this->addReturnUrl) {
+                $params['return'] = Url::current();
+            }
+            $params[0] = $this->controller ? $this->controller . '/' . $action : $action;
+
+            return Url::toRoute($params);
+        }
+    }
 }