diff --git a/ogWebconsole/src/app/app-routing.module.ts b/ogWebconsole/src/app/app-routing.module.ts
index e80e89f..ba8e87d 100644
--- a/ogWebconsole/src/app/app-routing.module.ts
+++ b/ogWebconsole/src/app/app-routing.module.ts
@@ -18,7 +18,6 @@ const routes: Routes = [
{ path: 'admin', component: AdminComponent },
{ path: 'users', component: UsersComponent },
{ path: 'user-groups', component: RolesComponent },
- // otras rutas que usan el MainLayoutComponent
],
},
{
@@ -26,7 +25,6 @@ const routes: Routes = [
component: AuthLayoutComponent,
children: [
{ path: 'login', component: LoginComponent },
- // otras rutas de autenticación
],
},
{ path: '**', component: PageNotFoundComponent },
diff --git a/ogWebconsole/src/app/components/pages/admin/roles/roles/roles.component.html b/ogWebconsole/src/app/components/pages/admin/roles/roles/roles.component.html
index 8fc0e5b..3247992 100644
--- a/ogWebconsole/src/app/components/pages/admin/roles/roles/roles.component.html
+++ b/ogWebconsole/src/app/components/pages/admin/roles/roles/roles.component.html
@@ -13,7 +13,7 @@
Acciones |
-
+
|
diff --git a/ogWebconsole/src/app/components/pages/admin/users/users/edit-user-modal/edit-user-modal.component.html b/ogWebconsole/src/app/components/pages/admin/users/users/edit-user-modal/edit-user-modal.component.html
index 0c0dc5a..80b0a4c 100644
--- a/ogWebconsole/src/app/components/pages/admin/users/users/edit-user-modal/edit-user-modal.component.html
+++ b/ogWebconsole/src/app/components/pages/admin/users/users/edit-user-modal/edit-user-modal.component.html
@@ -17,6 +17,15 @@
+
+
+ Organizational Units
+
+
+ {{unit.name}}
+
+
+
diff --git a/ogWebconsole/src/app/components/pages/admin/users/users/edit-user-modal/edit-user-modal.component.ts b/ogWebconsole/src/app/components/pages/admin/users/users/edit-user-modal/edit-user-modal.component.ts
index 0501aed..dd76248 100644
--- a/ogWebconsole/src/app/components/pages/admin/users/users/edit-user-modal/edit-user-modal.component.ts
+++ b/ogWebconsole/src/app/components/pages/admin/users/users/edit-user-modal/edit-user-modal.component.ts
@@ -17,6 +17,7 @@ interface UserGroup {
export class EditUserModalComponent implements OnInit {@Output() userEdited = new EventEmitter();
userForm: FormGroup;
userGroups: UserGroup[] = [];
+ organizationalUnits: any[] = [];
constructor(
public dialogRef: MatDialogRef,
@@ -24,10 +25,12 @@ export class EditUserModalComponent implements OnInit {@Output() userEdited = ne
private fb: FormBuilder,
private userService: UserService // Inyecta el servicio
) {
+ console.log(this.data)
this.userForm = this.fb.group({
username: [this.data.user.username],
password: [''],
- role: this.data.user.allowedOrganizationalUnits, // Control para el permiso seleccionado
+ role: this.data.user.allowedOrganizationalUnits,
+ organizationalUnit: [[this.data.user.allowedOrganizationalUnits], Validators.required]
});
}
@@ -35,6 +38,9 @@ export class EditUserModalComponent implements OnInit {@Output() userEdited = ne
this.userService.getUserGroups().subscribe((data) => {
this.userGroups = data['hydra:member'];
});
+ this.userService.getOrganizationalUnits().subscribe((data) => {
+ this.organizationalUnits = data['hydra:member'];
+ });
}
onNoClick(): void {