diff --git a/src/User/Controller/AdminController.php b/src/User/Controller/AdminController.php index 2ca12c6..2a42ebd 100644 --- a/src/User/Controller/AdminController.php +++ b/src/User/Controller/AdminController.php @@ -164,10 +164,11 @@ class AdminController extends Controller { /** @var User $user */ $user = $this->userQuery->where(['id' => $id])->one(); + /** @var Profile $profile */ $profile = $user->profile; if ($profile === null) { $profile = $this->make(Profile::class); - $profile->link($user); + $profile->link('user', $user); } /** @var UserEvent $event */ $event = $this->make(UserEvent::class, [$user]); @@ -244,7 +245,7 @@ class AdminController extends Controller public function actionDelete($id) { - if ($id === Yii::$app->user->getId()) { + if ((int)$id === Yii::$app->user->getId()) { Yii::$app->getSession()->setFlash('danger', Yii::t('usuario', 'You cannot remove your own account')); } else { /** @var User $user */ @@ -269,7 +270,7 @@ class AdminController extends Controller public function actionBlock($id) { - if ($id === Yii::$app->user->getId()) { + if ((int)$id === Yii::$app->user->getId()) { Yii::$app->getSession()->setFlash('danger', Yii::t('usuario', 'You cannot remove your own account')); } else { /** @var User $user */ diff --git a/src/User/Service/AuthItemEditionService.php b/src/User/Service/AuthItemEditionService.php index 8e9fa9d..650e1b6 100644 --- a/src/User/Service/AuthItemEditionService.php +++ b/src/User/Service/AuthItemEditionService.php @@ -64,10 +64,13 @@ class AuthItemEditionService implements ServiceInterface $this->model->item = $item; - return $this->updateChildren(); + $this->updateChildren(); + } catch (Exception $e) { return false; } + + return true; } /** diff --git a/src/User/Service/UpdateAuthAssignmentsService.php b/src/User/Service/UpdateAuthAssignmentsService.php index d8165fe..20cbd9a 100644 --- a/src/User/Service/UpdateAuthAssignmentsService.php +++ b/src/User/Service/UpdateAuthAssignmentsService.php @@ -28,7 +28,7 @@ class UpdateAuthAssignmentsService implements ServiceInterface public function run() { - if ($this->model->validate()) { + if (!$this->model->validate()) { return false; }