diff --git a/frontend/src/app/organization/organization-admin/organization-admin.component.ts b/frontend/src/app/organization/organization-admin/organization-admin.component.ts index 7c7d95774..dae08a1f8 100644 --- a/frontend/src/app/organization/organization-admin/organization-admin.component.ts +++ b/frontend/src/app/organization/organization-admin/organization-admin.component.ts @@ -8,12 +8,11 @@ */ import { Component, Signal } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; +import { Router } from '@angular/router'; import { Organization } from '../organization.model'; import { MatSnackBar } from '@angular/material/snack-bar'; import { Observable } from 'rxjs'; -import { Profile } from '../../profile/profile.service'; -import { profileResolver } from '../../profile/profile.resolver'; +import { Profile, ProfileService } from '../../profile/profile.service'; import { OrganizationService } from '../organization.service'; import { PermissionService } from '../../permission.service'; @@ -36,25 +35,19 @@ export class OrganizationAdminComponent { public static Route = { path: 'admin', component: OrganizationAdminComponent, - title: 'Organization Administration', - resolve: { profile: profileResolver } + title: 'Organization Administration' }; constructor( - private route: ActivatedRoute, private router: Router, private snackBar: MatSnackBar, + private profileService: ProfileService, private organizationService: OrganizationService, private permissionService: PermissionService ) { + this.profile = this.profileService.profile()!; this.organizations = organizationService.organizations; this.displayedOrganizations = organizationService.adminOrganizations; - - /** Get the profile data of the signed in user */ - const data = this.route.snapshot.data as { - profile: Profile; - }; - this.profile = data.profile; } /** Resposible for generating delete and create buttons in HTML code when admin signed in. diff --git a/frontend/src/app/organization/organization-details/organization-details.component.html b/frontend/src/app/organization/organization-details/organization-details.component.html index 4e9c91d58..136eebaff 100644 --- a/frontend/src/app/organization/organization-details/organization-details.component.html +++ b/frontend/src/app/organization/organization-details/organization-details.component.html @@ -7,13 +7,13 @@ [organization]="organization" [profile]="profile" /> -
- -
+ [showCreateButton]="(eventCreationPermission$ | async)!" /> + --> } diff --git a/frontend/src/app/organization/organization-page/organization-page.component.ts b/frontend/src/app/organization/organization-page/organization-page.component.ts index 9d0878d29..9d2e01804 100644 --- a/frontend/src/app/organization/organization-page/organization-page.component.ts +++ b/frontend/src/app/organization/organization-page/organization-page.component.ts @@ -9,7 +9,6 @@ */ import { Component, Signal, effect } from '@angular/core'; -import { profileResolver } from '../../profile/profile.resolver'; import { Organization } from '../organization.model'; import { MatSnackBar } from '@angular/material/snack-bar'; import { Profile, ProfileService } from '../../profile/profile.service'; @@ -27,8 +26,7 @@ export class OrganizationPageComponent { path: '', title: 'CS Organizations', component: OrganizationPageComponent, - canActivate: [], - resolve: { profile: profileResolver } + canActivate: [] }; /** Current search bar query on the organization page. */