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

Merge branch 'master' into w2p-67611_Convert-external-source-to-entity

Browse Source 
Conflicts:
	src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
This commit is contained in:
Kristof De Langhe
2020-01-06 13:24:20 +01:00
parent ea05af74bd 4b67dbf10f
commit 5de567b8b0
23 changed files with 316 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/shared/object-list/object-list.component.ts
View File

@@ -1,21 +1,11 @@
import {
ChangeDetectionStrategy,
Component,
EventEmitter,
Input,
Output,
ViewEncapsulation
} from '@angular/core';
import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output, ViewEncapsulation } from '@angular/core';
import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
import { PaginatedList } from '../../core/data/paginated-list';
import { RemoteData } from '../../core/data/remote-data';
import { fadeIn } from '../animations/fade';
import { ListableObject } from '../object-collection/shared/listable-object.model';
import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
import { DSpaceObject } from '../../core/shared/dspace-object.model';
import { SearchResult } from '../search/search-result.model';
import { SelectableListService } from './selectable-list/selectable-list.service';
import { map, take, tap } from 'rxjs/operators';
import { ViewMode } from '../../core/shared/view-mode.model';
import { Context } from '../../core/shared/context.model';
import { CollectionElementLinkType } from '../object-collection/collection-element-link.type';
@@ -60,9 +50,6 @@ export class ObjectListComponent {
@Input() hidePagerWhenSinglePage = true;
@Input() selectable = false;
@Input() selectionConfig: { repeatable: boolean, listId: string };
// @Input() previousSelection: ListableObject[] = [];
// allSelected = false;
// selectAllLoading = false;
/**
* The link type of the listable elements