mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-17 06:53:03 +00:00
Fixed ePerson link on edit group page
This commit is contained in:
@@ -24,8 +24,7 @@
|
|||||||
<tr *ngFor="let eperson of (ePeopleMembersOfGroup | async)?.page">
|
<tr *ngFor="let eperson of (ePeopleMembersOfGroup | async)?.page">
|
||||||
<td class="align-middle">{{eperson.id}}</td>
|
<td class="align-middle">{{eperson.id}}</td>
|
||||||
<td class="align-middle">
|
<td class="align-middle">
|
||||||
<a (click)="ePersonDataService.startEditingNewEPerson(eperson)"
|
<a [routerLink]="getEPersonEditRoute(eperson.id)">
|
||||||
[routerLink]="[ePersonDataService.getEPeoplePageRouterLink()]">
|
|
||||||
{{ dsoNameService.getName(eperson) }}
|
{{ dsoNameService.getName(eperson) }}
|
||||||
</a>
|
</a>
|
||||||
</td>
|
</td>
|
||||||
@@ -106,8 +105,7 @@
|
|||||||
<tr *ngFor="let eperson of (ePeopleSearch | async)?.page">
|
<tr *ngFor="let eperson of (ePeopleSearch | async)?.page">
|
||||||
<td class="align-middle">{{eperson.id}}</td>
|
<td class="align-middle">{{eperson.id}}</td>
|
||||||
<td class="align-middle">
|
<td class="align-middle">
|
||||||
<a (click)="ePersonDataService.startEditingNewEPerson(eperson)"
|
<a [routerLink]="getEPersonEditRoute(eperson.id)">
|
||||||
[routerLink]="[ePersonDataService.getEPeoplePageRouterLink()]">
|
|
||||||
{{ dsoNameService.getName(eperson) }}
|
{{ dsoNameService.getName(eperson) }}
|
||||||
</a>
|
</a>
|
||||||
</td>
|
</td>
|
||||||
|
@@ -68,9 +68,6 @@ describe('MembersListComponent', () => {
|
|||||||
clearLinkRequests() {
|
clearLinkRequests() {
|
||||||
// empty
|
// empty
|
||||||
},
|
},
|
||||||
getEPeoplePageRouterLink(): string {
|
|
||||||
return '/access-control/epeople';
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
groupsDataServiceStub = {
|
groupsDataServiceStub = {
|
||||||
activeGroup: activeGroup,
|
activeGroup: activeGroup,
|
||||||
|
@@ -23,6 +23,7 @@ import { NotificationsService } from '../../../../shared/notifications/notificat
|
|||||||
import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
|
import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
|
||||||
import { PaginationService } from '../../../../core/pagination/pagination.service';
|
import { PaginationService } from '../../../../core/pagination/pagination.service';
|
||||||
import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
|
import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
|
||||||
|
import { getEPersonEditRoute } from '../../../access-control-routing-paths';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Keys to keep track of specific subscriptions
|
* Keys to keep track of specific subscriptions
|
||||||
@@ -131,6 +132,8 @@ export class MembersListComponent implements OnInit, OnDestroy {
|
|||||||
// current active group being edited
|
// current active group being edited
|
||||||
groupBeingEdited: Group;
|
groupBeingEdited: Group;
|
||||||
|
|
||||||
|
readonly getEPersonEditRoute = getEPersonEditRoute;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
protected groupDataService: GroupDataService,
|
protected groupDataService: GroupDataService,
|
||||||
public ePersonDataService: EPersonDataService,
|
public ePersonDataService: EPersonDataService,
|
||||||
|
@@ -34,7 +34,7 @@ import { PatchData, PatchDataImpl } from '../data/base/patch-data';
|
|||||||
import { DeleteData, DeleteDataImpl } from '../data/base/delete-data';
|
import { DeleteData, DeleteDataImpl } from '../data/base/delete-data';
|
||||||
import { RestRequestMethod } from '../data/rest-request-method';
|
import { RestRequestMethod } from '../data/rest-request-method';
|
||||||
import { dataService } from '../data/base/data-service.decorator';
|
import { dataService } from '../data/base/data-service.decorator';
|
||||||
import { getEPersonEditRoute, getEPersonsRoute } from '../../access-control/access-control-routing-paths';
|
import { getEPersonEditRoute } from '../../access-control/access-control-routing-paths';
|
||||||
|
|
||||||
const ePeopleRegistryStateSelector = (state: AppState) => state.epeopleRegistry;
|
const ePeopleRegistryStateSelector = (state: AppState) => state.epeopleRegistry;
|
||||||
const editEPersonSelector = createSelector(ePeopleRegistryStateSelector, (ePeopleRegistryState: EPeopleRegistryState) => ePeopleRegistryState.editEPerson);
|
const editEPersonSelector = createSelector(ePeopleRegistryStateSelector, (ePeopleRegistryState: EPeopleRegistryState) => ePeopleRegistryState.editEPerson);
|
||||||
@@ -313,13 +313,6 @@ export class EPersonDataService extends IdentifiableDataService<EPerson> impleme
|
|||||||
return getEPersonEditRoute(ePerson.id);
|
return getEPersonEditRoute(ePerson.id);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Get EPeople admin page
|
|
||||||
*/
|
|
||||||
public getEPeoplePageRouterLink(): string {
|
|
||||||
return getEPersonsRoute();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a new EPerson using a token
|
* Create a new EPerson using a token
|
||||||
* @param eperson
|
* @param eperson
|
||||||
|
@@ -72,9 +72,6 @@ describe('ReviewersListComponent', () => {
|
|||||||
clearLinkRequests() {
|
clearLinkRequests() {
|
||||||
// empty
|
// empty
|
||||||
},
|
},
|
||||||
getEPeoplePageRouterLink(): string {
|
|
||||||
return '/access-control/epeople';
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
groupsDataServiceStub = {
|
groupsDataServiceStub = {
|
||||||
activeGroup: activeGroup,
|
activeGroup: activeGroup,
|
||||||
|
Reference in New Issue
Block a user