hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-10 03:23:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed resource policy's group edit link

Browse Source
This commit is contained in:
Giuseppe Digilio
2020-04-16 17:12:20 +02:00
parent 98ade2eb63
commit c03146e415
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/+admin/admin-access-control/admin-access-control-routing.module.ts
View File

@@ -6,7 +6,7 @@ import { GroupsRegistryComponent } from './group-registry/groups-registry.compon
import { URLCombiner } from '../../core/url-combiner/url-combiner'; import { URLCombiner } from '../../core/url-combiner/url-combiner';
import { getAccessControlModulePath } from '../admin-routing.module'; import { getAccessControlModulePath } from '../admin-routing.module';
const GROUP_EDIT_PATH = 'groups'; export const GROUP_EDIT_PATH = 'groups';
export function getGroupEditPath(id: string) { export function getGroupEditPath(id: string) {
return new URLCombiner(getAccessControlModulePath(), GROUP_EDIT_PATH, id).toString(); return new URLCombiner(getAccessControlModulePath(), GROUP_EDIT_PATH, id).toString();

2
src/app/+admin/admin-routing.module.ts
View File

@@ -6,7 +6,7 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
import { URLCombiner } from '../core/url-combiner/url-combiner'; import { URLCombiner } from '../core/url-combiner/url-combiner';
const REGISTRIES_MODULE_PATH = 'registries'; const REGISTRIES_MODULE_PATH = 'registries';
const ACCESS_CONTROL_MODULE_PATH = 'access-control'; export const ACCESS_CONTROL_MODULE_PATH = 'access-control';
export function getRegistriesModulePath() { export function getRegistriesModulePath() {
return new URLCombiner(getAdminModulePath(), REGISTRIES_MODULE_PATH).toString(); return new URLCombiner(getAdminModulePath(), REGISTRIES_MODULE_PATH).toString();

2
src/app/app-routing.module.ts
View File

@@ -33,7 +33,7 @@ export function getBitstreamModulePath() {
return `/${BITSTREAM_MODULE_PATH}`; return `/${BITSTREAM_MODULE_PATH}`;
} }
const ADMIN_MODULE_PATH = 'admin'; export const ADMIN_MODULE_PATH = 'admin';
export function getAdminModulePath() { export function getAdminModulePath() {
return `/${ADMIN_MODULE_PATH}`; return `/${ADMIN_MODULE_PATH}`;

7
src/app/shared/resource-policies/resource-policies.component.ts
View File

@@ -22,6 +22,9 @@ import { RequestService } from '../../core/data/request.service';
import { NotificationsService } from '../notifications/notifications.service'; import { NotificationsService } from '../notifications/notifications.service';
import { dateToString, stringToNgbDateStruct } from '../date.util'; import { dateToString, stringToNgbDateStruct } from '../date.util';
import { followLink } from '../utils/follow-link-config.model'; import { followLink } from '../utils/follow-link-config.model';
import { ADMIN_MODULE_PATH } from '../../app-routing.module';
import { ACCESS_CONTROL_MODULE_PATH } from '../../+admin/admin-routing.module';
import { GROUP_EDIT_PATH } from '../../+admin/admin-access-control/admin-access-control-routing.module';
interface ResourcePolicyCheckboxEntry { interface ResourcePolicyCheckboxEntry {
id: string; id: string;
@@ -307,7 +310,9 @@ export class ResourcePoliciesComponent implements OnInit, OnDestroy {
filter(() => this.isActive), filter(() => this.isActive),
getFirstSucceededRemoteDataPayload(), getFirstSucceededRemoteDataPayload(),
map((group: Group) => group.id) map((group: Group) => group.id)
).subscribe((groupUUID) => this.router.navigate(['groups', groupUUID, 'edit'])) ).subscribe((groupUUID) => {
this.router.navigate([ADMIN_MODULE_PATH, ACCESS_CONTROL_MODULE_PATH, GROUP_EDIT_PATH, groupUUID])
})
) )
} }