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

Improved redirect after 'Save for later' in Submission edit page

Browse Source
This commit is contained in:
Giuseppe
2018-07-31 17:51:10 +02:00
parent 9424116b41
commit ba1337ec8f
7 changed files with 65 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/shared/chips/models/chips.model.ts
View File

@@ -2,6 +2,7 @@ import { findIndex, isEqual, isObject } from 'lodash';
import { BehaviorSubject } from 'rxjs/BehaviorSubject';
import { ChipsItem, ChipsItemIcon } from './chips-item.model';
import { hasValue, isNotEmpty } from '../../empty.util';
import { PLACEHOLDER_PARENT_METADATA } from '../../form/builder/ds-dynamic-form-ui/models/dynamic-group/dynamic-group.model';
export interface IconsConfig {
withAuthority?: {
@@ -83,6 +84,14 @@ export class Chips {
return this._items.length > 0;
}
private hasPlaceholder(value) {
if (isObject(value)) {
return value.value === PLACEHOLDER_PARENT_METADATA;
} else {
return value === PLACEHOLDER_PARENT_METADATA;
}
}
public remove(chipsItem: ChipsItem): void {
const index = findIndex(this._items, {id: chipsItem.id});
this._items.splice(index, 1);
@@ -119,7 +128,7 @@ export class Chips {
config = (configIndex !== -1) ? this.iconsConfig[configIndex].config : defaultConfig;
if (hasValue(value) && isNotEmpty(config)) {
if (hasValue(value) && isNotEmpty(config) && !this.hasPlaceholder(value)) {
let icon: ChipsItemIcon;
const hasAuthority: boolean = !!(isObject(value) && ((value.hasOwnProperty('authority') && value.authority) || (value.hasOwnProperty('id') && value.id)));