Merge branch 'dev'

backend/controllers/UserController.php

@@ -156,7 +156,10 @@ class UserController extends BackendController {
             throw new \yii\web\NotFoundHttpException('L\'enregistrement UserEtablissement est introuvable', 404) ;
         }
         
-        $this->redirect(['index']);
+        $params = Yii::$app->getRequest()->getQueryParams() ;
+        unset($params['id']) ;
+        
+        $this->redirect(array_merge(['index'],$params));
     }
 
     public function actionMail($id_point_vente = 0) {

backend/views/user/index.php

@@ -164,8 +164,8 @@ $this->params['breadcrumbs'][] = $this->title;
                         }
                     },
                     'delete' => function($url, $model) {
-                        if($model['actif']) {
-                            return Html::a('<span class="glyphicon glyphicon-trash"></span> Supprimer', Yii::$app->urlManager->createUrl(['user/delete','id' => $model['user_id']]), [
+                        if($model['actif']) {                            
+                            return Html::a('<span class="glyphicon glyphicon-trash"></span> Supprimer', Yii::$app->urlManager->createUrl(array_merge(['user/delete','id' => $model['user_id']],  Yii::$app->getRequest()->getQueryParams())), [
                                             'title' => Yii::t('app', 'Supprimer'), 'class' => 'btn btn-default'
                             ]);    
                         }