diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts b/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts index 425a61ddb3..2fb955bb02 100644 --- a/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts +++ b/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts @@ -107,7 +107,7 @@ describe('EPeopleRegistryComponent', () => { // empty }, getEPeoplePageRouterLink(): string { - return '/admin/access-control/epeople'; + return '/access-control/epeople'; } }; authorizationService = jasmine.createSpyObj('authorizationService', { diff --git a/src/app/access-control/group-registry/group-form/group-form.component.spec.ts b/src/app/access-control/group-registry/group-form/group-form.component.spec.ts index 00fe2aa6e6..d213a071d7 100644 --- a/src/app/access-control/group-registry/group-form/group-form.component.spec.ts +++ b/src/app/access-control/group-registry/group-form/group-form.component.spec.ts @@ -75,7 +75,7 @@ describe('GroupFormComponent', () => { return observableOf(this.activeGroup); }, getGroupRegistryRouterLink(): string { - return '/admin/access-control/groups'; + return '/access-control/groups'; }, editGroup(group: Group) { this.activeGroup = group; diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts b/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts index bb7fd48ec6..20419fb49d 100644 --- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts +++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts @@ -66,7 +66,7 @@ describe('MembersListComponent', () => { // empty }, getEPeoplePageRouterLink(): string { - return '/admin/access-control/epeople'; + return '/access-control/epeople'; } }; groupsDataServiceStub = { @@ -97,7 +97,7 @@ describe('MembersListComponent', () => { // empty }, getGroupEditPageRouterLink(group: Group): string { - return '/admin/access-control/groups/' + group.id; + return '/access-control/groups/' + group.id; }, deleteMemberFromGroup(parentGroup, epersonToDelete: EPerson): Observable { this.epersonMembers = this.epersonMembers.find((eperson: EPerson) => { diff --git a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts index b8ba1e4f13..e839d77a6a 100644 --- a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts +++ b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts @@ -70,7 +70,7 @@ describe('SubgroupsListComponent', () => { ); }, getGroupEditPageRouterLink(group: Group): string { - return '/admin/access-control/groups/' + group.id; + return '/access-control/groups/' + group.id; }, searchGroups(query: string): Observable>> { if (query === '') { diff --git a/src/app/access-control/group-registry/groups-registry.component.spec.ts b/src/app/access-control/group-registry/groups-registry.component.spec.ts index c7d502eff6..b5b5a1b209 100644 --- a/src/app/access-control/group-registry/groups-registry.component.spec.ts +++ b/src/app/access-control/group-registry/groups-registry.component.spec.ts @@ -98,10 +98,10 @@ describe('GroupRegistryComponent', () => { } }, getGroupEditPageRouterLink(group: Group): string { - return '/admin/access-control/groups/' + group.id; + return '/access-control/groups/' + group.id; }, getGroupRegistryRouterLink(): string { - return '/admin/access-control/groups'; + return '/access-control/groups'; }, searchGroups(query: string): Observable>> { if (query === '') { diff --git a/src/app/core/eperson/eperson-data.service.ts b/src/app/core/eperson/eperson-data.service.ts index 5b52510ddd..bceb38f163 100644 --- a/src/app/core/eperson/eperson-data.service.ts +++ b/src/app/core/eperson/eperson-data.service.ts @@ -269,7 +269,7 @@ export class EPersonDataService extends DataService { this.editEPerson(ePerson); } }); - return '/admin/access-control/epeople'; + return '/access-control/epeople'; } /** @@ -277,7 +277,7 @@ export class EPersonDataService extends DataService { * @param ePerson New EPerson to edit */ public getEPeoplePageRouterLink(): string { - return '/admin/access-control/epeople'; + return '/access-control/epeople'; } /** diff --git a/src/app/core/eperson/group-data.service.ts b/src/app/core/eperson/group-data.service.ts index cff1c37f09..5b8f474d1a 100644 --- a/src/app/core/eperson/group-data.service.ts +++ b/src/app/core/eperson/group-data.service.ts @@ -209,7 +209,7 @@ export class GroupDataService extends DataService { } public getGroupRegistryRouterLink(): string { - return '/admin/access-control/groups'; + return '/access-control/groups'; } /** @@ -240,7 +240,7 @@ export class GroupDataService extends DataService { * @param groupID Group ID we want edit page for */ public getGroupEditPageRouterLinkWithID(groupId: string): string { - return '/admin/access-control/groups/' + groupId; + return '/access-control/groups/' + groupId; } /** diff --git a/src/app/shared/resource-policies/resource-policies.component.ts b/src/app/shared/resource-policies/resource-policies.component.ts index bc83314ee4..8380c78db1 100644 --- a/src/app/shared/resource-policies/resource-policies.component.ts +++ b/src/app/shared/resource-policies/resource-policies.component.ts @@ -316,7 +316,7 @@ export class ResourcePoliciesComponent implements OnInit, OnDestroy { getFirstSucceededRemoteDataPayload(), map((group: Group) => group.id) ).subscribe((groupUUID) => { - this.router.navigate([ADMIN_MODULE_PATH, ACCESS_CONTROL_MODULE_PATH, GROUP_EDIT_PATH, groupUUID]); + this.router.navigate([ACCESS_CONTROL_MODULE_PATH, GROUP_EDIT_PATH, groupUUID]); }) ); }