Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
taskonsite-архив-перенесен
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Packages
Packages
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dmitry Korolev
taskonsite-архив-перенесен
Commits
6ff3df41
Commit
6ff3df41
authored
May 05, 2016
by
Shakarim Sapa
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
358780bb
78ffdacb
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
6 deletions
+4
-6
common/modules/users/controllers/UserAdminController.php
common/modules/users/controllers/UserAdminController.php
+4
-6
No files found.
common/modules/users/controllers/UserAdminController.php
View file @
6ff3df41
...
@@ -200,12 +200,11 @@ class UserAdminController extends \common\components\AdminController
...
@@ -200,12 +200,11 @@ class UserAdminController extends \common\components\AdminController
$model
->
password
=
\Yii
::
$app
->
security
->
generatePasswordHash
(
$model
->
password
);
$model
->
password
=
\Yii
::
$app
->
security
->
generatePasswordHash
(
$model
->
password
);
$model
->
activate_code
=
\Yii
::
$app
->
security
->
generatePasswordHash
(
$model
->
password
.
'xdf5sf'
);
$model
->
activate_code
=
\Yii
::
$app
->
security
->
generatePasswordHash
(
$model
->
password
.
'xdf5sf'
);
if
(
!
$model
->
save
(
false
))
die
(
print_r
(
$model
->
error
));
$this
->
redirect
(
array
(
$model
->
save
(
false
);
return
$this
->
redirect
(
array
(
'/rbac/role-admin/manage'
,
'/rbac/role-admin/manage'
,
'id'
=>
$model
->
id
,
'is_created'
=>
1
));
));
}
}
}
}
...
@@ -251,8 +250,7 @@ class UserAdminController extends \common\components\AdminController
...
@@ -251,8 +250,7 @@ class UserAdminController extends \common\components\AdminController
AuthAssignment
::
updateUserRole
(
$model
->
id
,
$_POST
[
'User'
][
'role'
]);
AuthAssignment
::
updateUserRole
(
$model
->
id
,
$_POST
[
'User'
][
'role'
]);
return
$this
->
redirect
(
array
(
return
$this
->
redirect
(
array
(
'/rbac/role-admin/manage'
,
'/rbac/role-admin/manage'
'id'
=>
$model
->
id
));
));
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment