Commit 6cdb5a0b authored by Tobias Munk's avatar Tobias Munk

fixed redirects for global widgets

parent ce1ee30b
...@@ -132,7 +132,7 @@ class WidgetController extends Controller ...@@ -132,7 +132,7 @@ class WidgetController extends Controller
{ {
$model = $this->findModel($id); $model = $this->findModel($id);
if ($model->load($_POST) && $model->save()) { if ($model->load($_POST) && $model->save() && Url::previous($model->route)) {
return $this->redirect(Url::previous($model->route)); return $this->redirect(Url::previous($model->route));
} else { } else {
return $this->render('update', [ return $this->render('update', [
...@@ -162,15 +162,7 @@ class WidgetController extends Controller ...@@ -162,15 +162,7 @@ class WidgetController extends Controller
return $this->redirect(Url::previous()); return $this->redirect(Url::previous());
} }
// TODO: improve detection if (Url::previous($redirectUrl)) {
$isPivot = strstr('$id', ',');
if ($isPivot == true) {
return $this->redirect(Url::previous());
} elseif (isset(\Yii::$app->session['__crudReturnUrl']) && \Yii::$app->session['__crudReturnUrl'] != '/') {
Url::remember(null);
$url = \Yii::$app->session['__crudReturnUrl'];
\Yii::$app->session['__crudReturnUrl'] = null;
return $this->redirect(Url::previous($redirectUrl)); return $this->redirect(Url::previous($redirectUrl));
} else { } else {
return $this->redirect(['index']); return $this->redirect(['index']);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment