Skip to content

Commit a9adf0e

Browse files
1.0.0-alpha
1 parent 2ae5202 commit a9adf0e

7 files changed

Lines changed: 37 additions & 19 deletions

File tree

CmsAuthClientModule.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@
66
* @date 15.04.2016
77
*/
88
namespace skeeks\cms\authclient;
9+
use yii\base\Module;
10+
911
/**
1012
* Class CmsAuthClientModule
1113
* @package skeeks\cms\authclient
1214
*/
13-
class CmsAuthClientModule extends \skeeks\cms\base\Module
15+
class CmsAuthclientModule extends Module
1416
{
1517
public $controllerNamespace = 'skeeks\cms\authclient\controllers';
1618
}

config/admin/menu.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
[
3131
"label" => \Yii::t('skeeks/authclient', "Social profiles"),
32-
"url" => ["cms/admin-user-auth-client"],
32+
"url" => ["authclient/admin-user-auth-client"],
3333
"img" => ['\skeeks\cms\authclient\assets\CmsAuthclientAsset', 'icons/facebook.png']
3434
],
3535

config/main.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
'modules' =>
3535
[
3636
'authclient' => [
37-
'class' => 'skeeks\cms\authclient\CmsAuthclientModule',
37+
'class' => 'skeeks\cms\authclient\CmsAuthClientModule',
3838
]
3939
]
4040

controllers/AdminUserAuthClientController.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ public function actions()
4646
'class' => \skeeks\cms\grid\DateTimeColumnData::className(),
4747
'attribute' => "created_at"
4848
],
49-
50-
5149
],
5250
],
5351

controllers/AuthController.php

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,30 @@
77
*/
88
namespace skeeks\cms\authclient\controllers;
99

10+
use skeeks\cms\actions\LogoutAction;
11+
use skeeks\cms\base\Controller;
12+
use skeeks\cms\components\Cms;
13+
use skeeks\cms\helpers\AjaxRequestResponse;
14+
use skeeks\cms\helpers\RequestResponse;
15+
use skeeks\cms\helpers\UrlHelper;
16+
use skeeks\cms\models\CmsUserEmail;
17+
use skeeks\cms\models\forms\LoginForm;
18+
use skeeks\cms\models\forms\LoginFormUsernameOrEmail;
19+
use skeeks\cms\models\forms\PasswordResetRequestFormEmailOrLogin;
20+
use skeeks\cms\models\forms\SignupForm;
21+
use skeeks\cms\models\User;
22+
use skeeks\cms\modules\admin\controllers\helpers\ActionManager;
23+
use skeeks\cms\modules\admin\filters\AccessControl;
24+
use skeeks\cms\models\UserAuthClient;
25+
use yii\authclient\BaseOAuth;
26+
use yii\filters\VerbFilter;
27+
use yii\helpers\ArrayHelper;
28+
use yii\helpers\Json;
29+
use yii\helpers\Url;
30+
use yii\web\Response;
31+
use yii\widgets\ActiveForm;
32+
use \Yii;
33+
1034
/**
1135
* Class AuthController
1236
* @package skeeks\cms\modules\admin\controllers
@@ -23,8 +47,8 @@ public function actions()
2347
'client' => [
2448
'class' => 'yii\authclient\AuthAction',
2549
'successCallback' => [$this, 'onAuthSuccess'],
26-
'successUrl' => Url::to(['/cms/user/profile']),
27-
'cancelUrl' => Url::to(['/cms/user/profile']),
50+
'successUrl' => Url::to(['/cms/profile']),
51+
'cancelUrl' => Url::to(['/cms/profile']),
2852
],
2953
];
3054
}

messages/ru/main.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
return [
33
'Authorization through social networks' => 'Авторизация через социальные сети',
44
'Authorization by social networks' => 'Авторизация через социальные сети',
5+
'Social profiles' => 'Социальные профили',
56
];

views/admin-user-auth-client/_form.php

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,16 @@
11
<?php
2-
use yii\helpers\Html;
3-
use skeeks\cms\modules\admin\widgets\form\ActiveFormUseTab as ActiveForm;
4-
52
/* @var $this yii\web\View */
63
/* @var $model \yii\db\ActiveRecord */
74
?>
8-
<?php $form = ActiveForm::begin(); ?>
5+
<?php $form = skeeks\cms\modules\admin\widgets\form\ActiveFormUseTab::begin(); ?>
96

107
<?= $form->fieldSet(\Yii::t('app',"Main")); ?>
118
<? if (\Yii::$app->request->get('user_id')) : ?>
129
<?= $form->field($model, 'user_id')->hiddenInput(['value' => \Yii::$app->request->get('user_id')])->label(false) ?>
1310
<? else: ?>
14-
<?= $form->fieldSelect($model, 'user_id', \yii\helpers\ArrayHelper::map(
15-
\skeeks\cms\models\User::find()->active()->all(),
16-
'id',
17-
'displayName'
18-
), [
19-
'allowDeselect' => true
20-
]) ?>
11+
<?= $form->field($model, 'user_id')->widget(
12+
\skeeks\cms\modules\admin\widgets\formInputs\SelectModelDialogUserInput::className()
13+
) ?>
2114
<? endif; ?>
2215

2316
<?= $form->fieldSetEnd(); ?>
@@ -38,4 +31,4 @@
3831

3932

4033
<?= $form->buttonsCreateOrUpdate($model); ?>
41-
<?php ActiveForm::end(); ?>
34+
<?php skeeks\cms\modules\admin\widgets\form\ActiveFormUseTab::end(); ?>

0 commit comments

Comments
 (0)