hazza/yel-dspace-angular
1
0
Fork 0
forked from hazza/dspace-angular
Code Pull Requests Activity

Merge branch 'split-eperson-administration-page_contribute-7.6' into split-eperson-administration-page_contribute-maintenance-7.6

Browse Source
This commit is contained in:
Alexandre Vryghem
2023-10-19 23:01:48 +02:00
parent a419956e2a 2e571767ea
commit d473fcdf16
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/access-control/access-control-routing-paths.ts
View File

@@ -8,7 +8,7 @@ export function getEPersonsRoute(): string {
} }
export function getEPersonEditRoute(id: string): string { export function getEPersonEditRoute(id: string): string {
return new URLCombiner(getEPersonsRoute(), id).toString(); return new URLCombiner(getEPersonsRoute(), id, 'edit').toString();
} }
export const GROUP_PATH = 'groups'; export const GROUP_PATH = 'groups';
@@ -18,5 +18,5 @@ export function getGroupsRoute() {
} }
export function getGroupEditRoute(id: string) { export function getGroupEditRoute(id: string) {
return new URLCombiner(getGroupsRoute(), id).toString(); return new URLCombiner(getGroupsRoute(), id, 'edit').toString();
} }

4
src/app/access-control/access-control-routing.module.ts
View File

@@ -38,7 +38,7 @@ import { EPersonResolver } from './epeople-registry/eperson-resolver.service';
canActivate: [SiteAdministratorGuard], canActivate: [SiteAdministratorGuard],
}, },
{ {
path: `${EPERSON_PATH}/:id`, path: `${EPERSON_PATH}/:id/edit`,
component: EPersonFormComponent, component: EPersonFormComponent,
resolve: { resolve: {
breadcrumb: I18nBreadcrumbResolver, breadcrumb: I18nBreadcrumbResolver,
@@ -66,7 +66,7 @@ import { EPersonResolver } from './epeople-registry/eperson-resolver.service';
canActivate: [GroupAdministratorGuard] canActivate: [GroupAdministratorGuard]
}, },
{ {
path: `${GROUP_PATH}/:groupId`, path: `${GROUP_PATH}/:groupId/edit`,
component: GroupFormComponent, component: GroupFormComponent,
resolve: { resolve: {
breadcrumb: I18nBreadcrumbResolver breadcrumb: I18nBreadcrumbResolver

2
src/app/access-control/epeople-registry/epeople-registry.component.ts
View File

@@ -215,7 +215,7 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
if (restResponse.hasSucceeded) { if (restResponse.hasSucceeded) {
this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.deleted.success', {name: this.dsoNameService.getName(ePerson)})); this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.deleted.success', {name: this.dsoNameService.getName(ePerson)}));
} else { } else {
this.notificationsService.error(`Error occurred when trying to delete EPerson with id: ${ePerson.id} with code: ${restResponse.statusCode} and message: ${restResponse.errorMessage}`); this.notificationsService.error(this.translateService.get(this.labelPrefix + 'notification.deleted.success', { id: ePerson.id, statusCode: restResponse.statusCode, errorMessage: restResponse.errorMessage }));
} }
}); });
} }

2
src/assets/i18n/en.json5
View File

@@ -334,7 +334,7 @@
"admin.access-control.epeople.form.goToGroups": "Add to groups", "admin.access-control.epeople.form.goToGroups": "Add to groups",
"admin.access-control.epeople.notification.deleted.failure": "Failed to delete EPerson: \"{{name}}\"", "admin.access-control.epeople.notification.deleted.failure": "Error occurred when trying to delete EPerson with id \"{{id}}\" with code: \"{{statusCode}}\" and message: \"{{restResponse.errorMessage}}\"",
"admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"", "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",