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

Merge branch 'master' into w2p-45621_filter-facets-ui

Browse Source 
Conflicts:
	src/app/+search-page/search-page.component.html
	src/app/+search-page/search-page.component.ts
	src/app/shared/shared.module.ts
This commit is contained in:
Lotte Hofstede
2017-11-10 11:15:36 +01:00
parent 4522bc5e16 8682861dc6
commit be6f5ea9b5
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/+search-page/search-page.component.ts
View File

@@ -1,5 +1,6 @@
import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { Observable } from 'rxjs/Observable';
import { SortOptions } from '../core/cache/models/sort-options.model';
import { CommunityDataService } from '../core/data/community-data.service';
import { RemoteData } from '../core/data/remote-data';
@@ -10,7 +11,6 @@ import { PaginationComponentOptions } from '../shared/pagination/pagination-comp
import { SearchOptions } from './search-options.model';
import { SearchResult } from './search-result.model';
import { SearchService } from './search-service/search.service';
import { Observable } from 'rxjs/Observable';
import { pushInOut } from '../shared/animations/push';
import { HostWindowService } from '../shared/host-window.service';
import { SearchSidebarService } from './search-sidebar/search-sidebar.service';