update gridViewColumns setup for assignment controller

yii2mod · Oct 31, 2016 · 3219ffd · 3219ffd
1 parent c943172
commit 3219ffd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/controllers/AssignmentController.php b/controllers/AssignmentController.php
@@ -52,11 +52,7 @@ public function init()
         if (empty($this->gridViewColumns)) {
             $this->gridViewColumns = [
                 $this->idField,
-                $this->usernameField,
-                [
-                    'class' => 'yii\grid\ActionColumn',
-                    'template' => '{view}'
-                ]
+                $this->usernameField
             ];
         }
 

diff --git a/views/assignment/index.php b/views/assignment/index.php
@@ -1,6 +1,7 @@
 <?php
 
 use yii\grid\GridView;
+use yii\helpers\ArrayHelper;
 use yii\helpers\Html;
 use yii\widgets\Pjax;
 
@@ -22,7 +23,12 @@
     <?php echo GridView::widget([
         'dataProvider' => $dataProvider,
         'filterModel' => $searchModel,
-        'columns' => $gridViewColumns
+        'columns' => ArrayHelper::merge($gridViewColumns, [
+            [
+                'class' => 'yii\grid\ActionColumn',
+                'template' => '{view}'
+            ]
+        ])
     ]); ?>
 
     <?php Pjax::end(); ?>