Skip to content

Commit

Permalink
Fix some broken namespace requirements by webvimarks components
Browse files Browse the repository at this point in the history
  • Loading branch information
Stefan39 committed Jan 14, 2018
1 parent 09ece11 commit 8902d99
Show file tree
Hide file tree
Showing 18 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion controllers/AuthController.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace wpler\modules\UserManagement\controllers;

use wpler\components\BaseController;
use \webvimark\components\BaseController;
use wpler\modules\UserManagement\components\UserAuthEvent;
use wpler\modules\UserManagement\models\forms\ChangeOwnPasswordForm;
use wpler\modules\UserManagement\models\forms\ConfirmEmailForm;
Expand Down
2 changes: 1 addition & 1 deletion controllers/AuthItemGroupController.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use wpler\modules\UserManagement\models\rbacDB\AuthItemGroup;
use wpler\modules\UserManagement\models\rbacDB\search\AuthItemGroupSearch;
use Yii;
use wpler\components\AdminDefaultController;
use \webvimark\components\AdminDefaultController;

/**
* AuthItemGroupController implements the CRUD actions for AuthItemGroup model.
Expand Down
2 changes: 1 addition & 1 deletion controllers/PermissionController.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
use wpler\modules\UserManagement\models\rbacDB\Permission;
use wpler\modules\UserManagement\models\rbacDB\Route;
use wpler\modules\UserManagement\models\rbacDB\search\PermissionSearch;
use wpler\components\AdminDefaultController;
use \webvimark\components\AdminDefaultController;
use wpler\modules\UserManagement\UserManagementModule;
use Yii;

Expand Down
2 changes: 1 addition & 1 deletion controllers/RoleController.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use wpler\modules\UserManagement\models\rbacDB\Permission;
use wpler\modules\UserManagement\models\rbacDB\Role;
use wpler\modules\UserManagement\models\rbacDB\search\RoleSearch;
use wpler\components\AdminDefaultController;
use \webvimark\components\AdminDefaultController;
use wpler\modules\UserManagement\UserManagementModule;
use Yii;
use yii\rbac\DbManager;
Expand Down
2 changes: 1 addition & 1 deletion controllers/UserController.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace wpler\modules\UserManagement\controllers;

use wpler\components\AdminDefaultController;
use \webvimark\components\AdminDefaultController;
use Yii;
use wpler\modules\UserManagement\models\User;
use wpler\modules\UserManagement\models\search\UserSearch;
Expand Down
2 changes: 1 addition & 1 deletion controllers/UserPermissionController.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace wpler\modules\UserManagement\controllers;

use wpler\components\BaseController;
use \webvimark\components\BaseController;
use wpler\modules\UserManagement\models\rbacDB\Permission;
use wpler\modules\UserManagement\models\rbacDB\Role;
use wpler\modules\UserManagement\models\User;
Expand Down
2 changes: 1 addition & 1 deletion controllers/UserVisitLogController.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use Yii;
use wpler\modules\UserManagement\models\UserVisitLog;
use wpler\modules\UserManagement\models\search\UserVisitLogSearch;
use wpler\components\AdminDefaultController;
use \webvimark\components\AdminDefaultController;

/**
* UserVisitLogController implements the CRUD actions for UserVisitLog model.
Expand Down
4 changes: 2 additions & 2 deletions models/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace wpler\modules\UserManagement\models;

use wpler\helpers\LittleBigHelper;
use wpler\helpers\Singleton;
use \webvimark\helpers\LittleBigHelper;
use \webvimark\helpers\Singleton;
use wpler\modules\UserManagement\components\AuthHelper;
use wpler\modules\UserManagement\components\UserIdentity;
use wpler\modules\UserManagement\models\rbacDB\Role;
Expand Down
4 changes: 2 additions & 2 deletions models/UserVisitLog.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace wpler\modules\UserManagement\models;

use Ikimea\Browser\Browser;
use wpler\helpers\LittleBigHelper;
use \webvimark\helpers\LittleBigHelper;
use wpler\modules\UserManagement\UserManagementModule;
use Yii;

Expand All @@ -22,7 +22,7 @@
*
* @property User $user
*/
class UserVisitLog extends \wpler\components\BaseActiveRecord
class UserVisitLog extends \webvimark\components\BaseActiveRecord
{
CONST SESSION_TOKEN = '__visitorToken';

Expand Down
2 changes: 1 addition & 1 deletion models/forms/LoginForm.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
namespace wpler\modules\UserManagement\models\forms;

use wpler\helpers\LittleBigHelper;
use webvimark\helpers\LittleBigHelper;
use wpler\modules\UserManagement\models\User;
use wpler\modules\UserManagement\UserManagementModule;
use yii\base\Model;
Expand Down
2 changes: 1 addition & 1 deletion views/auth-item-group/_search.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

/**
* @var yii\web\View $this
* @var app\modules\merchant\models\search\AuthItemGroupSearch $model
* @var wpler\modules\UserManagement\models\rbacDB\search\AuthItemGroupSearch $model
* @var yii\widgets\ActiveForm $form
*/
?>
Expand Down
4 changes: 2 additions & 2 deletions views/auth-item-group/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
use yii\helpers\Url;
use yii\helpers\ArrayHelper;
use yii\widgets\Pjax;
use wpler\extensions\GridBulkActions\GridBulkActions;
use wpler\extensions\GridPageSize\GridPageSize;
use \webvimark\extensions\GridBulkActions\GridBulkActions;
use \webvimark\extensions\GridPageSize\GridPageSize;
use yii\grid\GridView;

/**
Expand Down
4 changes: 2 additions & 2 deletions views/permission/index.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
use wpler\extensions\GridBulkActions\GridBulkActions;
use wpler\extensions\GridPageSize\GridPageSize;
use \webvimark\extensions\GridBulkActions\GridBulkActions;
use \webvimark\extensions\GridPageSize\GridPageSize;
use wpler\modules\UserManagement\components\GhostHtml;
use wpler\modules\UserManagement\models\rbacDB\AuthItemGroup;
use wpler\modules\UserManagement\models\rbacDB\Permission;
Expand Down
4 changes: 2 additions & 2 deletions views/role/index.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
use wpler\extensions\GridBulkActions\GridBulkActions;
use wpler\extensions\GridPageSize\GridPageSize;
use \webvimark\extensions\GridBulkActions\GridBulkActions;
use \webvimark\extensions\GridPageSize\GridPageSize;
use wpler\modules\UserManagement\components\GhostHtml;
use wpler\modules\UserManagement\models\rbacDB\AuthItemGroup;
use wpler\modules\UserManagement\models\rbacDB\Role;
Expand Down
4 changes: 2 additions & 2 deletions views/user-visit-log/index.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php

use wpler\extensions\DateRangePicker\DateRangePicker;
use \webvimark\extensions\DateRangePicker\DateRangePicker;
use wpler\modules\UserManagement\UserManagementModule;
use yii\helpers\Html;
use yii\widgets\Pjax;
use wpler\extensions\GridPageSize\GridPageSize;
use \webvimark\extensions\GridPageSize\GridPageSize;
use yii\grid\GridView;

/**
Expand Down
2 changes: 1 addition & 1 deletion views/user/_form.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
use wpler\modules\UserManagement\UserManagementModule;
use yii\helpers\Html;
use yii\bootstrap\ActiveForm;
use wpler\extensions\BootstrapSwitch\BootstrapSwitch;
use \webvimark\extensions\BootstrapSwitch\BootstrapSwitch;

/**
* @var yii\web\View $this
Expand Down
10 changes: 5 additions & 5 deletions views/user/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
use yii\helpers\ArrayHelper;
use yii\helpers\Url;
use yii\widgets\Pjax;
use wpler\extensions\GridBulkActions\GridBulkActions;
use wpler\extensions\GridPageSize\GridPageSize;
use \webvimark\extensions\GridBulkActions\GridBulkActions;
use \webvimark\extensions\GridPageSize\GridPageSize;
use yii\grid\GridView;

/**
Expand Down Expand Up @@ -73,7 +73,7 @@
['class' => 'yii\grid\SerialColumn', 'options'=>['style'=>'width:10px'] ],

[
'class'=>'wpler\components\StatusColumn',
'class'=>'\webvimark\components\StatusColumn',
'attribute'=>'superadmin',
'visible'=>Yii::$app->user->isSuperadmin,
],
Expand All @@ -91,7 +91,7 @@
'visible'=>User::hasPermission('viewUserEmail'),
],
[
'class'=>'wpler\components\StatusColumn',
'class'=>'\webvimark\components\StatusColumn',
'attribute'=>'email_confirmed',
'visible'=>User::hasPermission('viewUserEmail'),
],
Expand Down Expand Up @@ -138,7 +138,7 @@
],
],
[
'class'=>'wpler\components\StatusColumn',
'class'=>'\webvimark\components\StatusColumn',
'attribute'=>'status',
'optionsArray'=>[
[User::STATUS_ACTIVE, UserManagementModule::t('back', 'Active'), 'success'],
Expand Down
2 changes: 1 addition & 1 deletion views/user/update.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

use wpler\modules\UserManagement\models\User;
use wpler\extensions\BootstrapSwitch\BootstrapSwitch;
use \webvimark\extensions\BootstrapSwitch\BootstrapSwitch;
use wpler\modules\UserManagement\UserManagementModule;
use yii\bootstrap\ActiveForm;
use yii\helpers\Html;
Expand Down

0 comments on commit 8902d99

Please sign in to comment.