fix: form fixes in user edit (#166)

ipti · Feb 16, 2023 · e1b73de · e1b73de
1 parent 6606b8c
commit e1b73de
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/app/controllers/AdminController.php b/app/controllers/AdminController.php
@@ -480,18 +480,19 @@ public function actionUpdate($id) {
 					$model->password = $password;
 					if ($model->save()) {
 						$save = TRUE;
+						foreach ($userSchools as $school) {
+							UsersSchool::model()->deleteAll(array("condition"=>"school_fk='$school->school_fk'"));
+						}
 						foreach ($_POST['schools'] as $school) {
-							$userSchool = UsersSchool::model()->findByAttributes(array('school_fk' => $school, 'user_fk' => $model->id));
-							if( $userSchool == null) {
-								$userSchool = new UsersSchool;
-								$userSchool->user_fk = $model->id;
-								$userSchool->school_fk = $school;
-								$save = $save && $userSchool->validate() && $userSchool->save();
-							}
+							$userSchool = new UsersSchool;
+							$userSchool->user_fk = $model->id;
+							$userSchool->school_fk = $school;
+							$save = $save && $userSchool->validate() && $userSchool->save();
+
 						}
 						if ($save) {
 							$auth = Yii::app()->authManager;
-							$auth->revoke($_POST['Role'], $model->id);
+							$auth->revoke($actual_role, $model->id);
 							$auth->assign($_POST['Role'], $model->id);
 							Yii::app()->user->setFlash('success', Yii::t('default', 'Usuário alterado com sucesso!'));
 							$this->redirect(['index']);

diff --git a/app/models/Users.php b/app/models/Users.php
@@ -70,7 +70,7 @@ public function attributeLabels()
 			'name' => Yii::t('default', 'Name'),
 			'username' => Yii::t('default', 'Username'),
 			'password' => Yii::t('default', 'Password'),
-			'active' => 'Active',
+			'active' => Yii::t('default', 'Active'),
 		);
 	}