Merge pull request #21 from enricodetoma/master

Bug fixes
dabilite · Jun 14, 2017 · 4805971 · 4805971
2 parents ffe298b + a8d4fe9
commit 4805971
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/models/UserSearch.php b/models/UserSearch.php
@@ -103,7 +103,8 @@ public function search($params)
             $query->andFilterWhere(['item_name' => $this->auth_item]);
         }
 
-        $table_name = $query->modelClass::tableName();
+        $model = $query->modelClass;
+        $table_name = $model::tableName();
 
         if ($this->created_at !== null) {
             $date = strtotime($this->created_at);

diff --git a/views/admin/index.php b/views/admin/index.php
@@ -139,7 +139,7 @@
                     }
                 },
                 'switch' => function ($url, $model) {
-                    if($model->isAdmin && $model->id != Yii::$app->user->id && Yii::$app->getModule('user')->enableImpersonateUser) {
+                    if(!$model->isAdmin && $model->id != Yii::$app->user->id && Yii::$app->getModule('user')->enableImpersonateUser) {
                         return Html::a('<span class="glyphicon glyphicon-user"></span>', ['/user/admin/switch', 'id' => $model->id], [
                             'title' => Yii::t('user', 'Become this user'),
                             'data-confirm' => Yii::t('user', 'Are you sure you want to switch to this user for the rest of this Session?'),