fix: namespace

krissss · Sep 27, 2018 · db1a58b · db1a58b
1 parent c985ea6
commit db1a58b
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 16 deletions.
diff --git a/generators/crud/default/views/_search.php b/generators/crud/default/views/_search.php
@@ -16,4 +16,4 @@
 echo $form->field($model, '<?=$attribute?>');
 <?php endforeach; ?>
 
-$form->end();
+SimpleSearchForm::end();
diff --git a/generators/dynagrid/default/views/_search.php b/generators/dynagrid/default/views/_search.php
@@ -16,6 +16,4 @@
 echo $form->field($model, '<?=$attribute?>');
 <?php endforeach; ?>
 
-echo $form->renderFooterButtons();
-
-$form->end();
+SimpleSearchForm::end();
diff --git a/modules/auth/views/role/create_update.php b/modules/auth/views/role/create_update.php
@@ -51,5 +51,4 @@
  </div>
  </div>
 <?php
-echo $form->renderFooterButtons();
-$form->end();
+SimpleActiveForm::end();
diff --git a/modules/auth/views/role/index.php b/modules/auth/views/role/index.php
@@ -4,6 +4,7 @@
 /* @var $dataProvider */
 
 use kriss\modules\auth\Module;
+use kriss\widgets\SimpleDynaGrid;
 use yii\helpers\Html;
 use kriss\modules\auth\tools\AuthValidate;
 
@@ -21,7 +22,8 @@
  /*[
  'attribute' => 'id',
  'hAlign' => 'center',
- ],*/ [
+ ],*/
+ [
  'attribute' => 'name',
  'hAlign' => 'center',
  'enableSorting' => false,
@@ -71,8 +73,7 @@
  ],
 ];
 
-$simpleDynaGrid = new \kriss\widgets\SimpleDynaGrid([
- 'dynaGridId' => 'dynagrid-auth-role-index',
+echo SimpleDynaGrid::widget([
  'columns' => $columns,
  'dataProvider' => $dataProvider,
  //'searchModel' => $searchModel,
@@ -85,5 +86,3 @@
  ],
  ],
 ]);
-$simpleDynaGrid->renderDynaGrid();
-
diff --git a/modules/auth/views/user-role/_update_role.php b/modules/auth/views/user-role/_update_role.php
@@ -40,7 +40,7 @@
  <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
  <button type="submit" class="btn btn-primary">确认</button>
  </div>
- <?php $form->end(); ?>
+ <?php ActiveForm::end(); ?>
  </div>
  </div>
 </div>
diff --git a/widgets/ExportMenu.php b/widgets/ExportMenu.php
@@ -6,9 +6,9 @@
 use yii\base\Exception;
 use yii\base\Widget;
 use yii\data\BaseDataProvider;
-use yii\grid\ActionColumn;
-use yii\grid\CheckboxColumn;
-use yii\grid\RadioButtonColumn;
+use yii\grid\ActionColumn as YiiActionColumn;
+use yii\grid\CheckboxColumn as YiiCheckboxColumn;
+use yii\grid\RadioButtonColumn as YiiRadioButtonColumn;
 use yii\helpers\ArrayHelper;
 use yii\helpers\Html;
 use yii2tech\csvgrid\CsvGrid;
@@ -28,7 +28,7 @@ class ExportMenu extends Widget
  public $columns = [];
 
  public $skipColumnClass = [
- ActionColumn::class, CheckboxColumn::class, RadioButtonColumn::class,
+ YiiActionColumn::class, YiiCheckboxColumn::class, YiiRadioButtonColumn::class,
  ];
 
  public $batchSize = 200;