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

#150 Fixing rebase errors

Browse Source
This commit is contained in:
Jonas Van Goolen
2017-11-30 15:06:52 +01:00
parent 27ae938153
commit b86905ab05
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,6 +12,8 @@ import { SearchService } from './search-service/search.service';
import { pushInOut } from '../shared/animations/push'; import { pushInOut } from '../shared/animations/push';
import { HostWindowService } from '../shared/host-window.service'; import { HostWindowService } from '../shared/host-window.service';
import { SearchSidebarService } from './search-sidebar/search-sidebar.service'; import { SearchSidebarService } from './search-sidebar/search-sidebar.service';
import { PaginationComponentOptions } from 'src/app/shared/pagination/pagination-component-options.model';
import { SortOptions } from '../core/cache/models/sort-options.model';
/** /**
* This component renders a simple item page. * This component renders a simple item page.
@@ -81,7 +83,6 @@ export class SearchPageComponent implements OnInit, OnDestroy {
// pageSizeOptions = [9, 18, 27, 36 , 45, 54, 63, 72]; // pageSizeOptions = [9, 18, 27, 36 , 45, 54, 63, 72];
} }
const sortDirection = +params.sortDirection || this.searchOptions.sort.direction; const sortDirection = +params.sortDirection || this.searchOptions.sort.direction;
const pagination = Object.assign({}, const pagination = Object.assign({},
this.searchOptions.pagination, this.searchOptions.pagination,

1
src/app/+search-page/search-service/search.service.ts
View File

@@ -15,7 +15,6 @@ import { FacetValue } from './facet-value.model';
import { ItemSearchResult } from '../../shared/object-collection/shared/item-search-result.model'; import { ItemSearchResult } from '../../shared/object-collection/shared/item-search-result.model';
import { ViewMode } from '../../+search-page/search-options.model'; import { ViewMode } from '../../+search-page/search-options.model';
import { Router, NavigationExtras, ActivatedRoute } from '@angular/router'; import { Router, NavigationExtras, ActivatedRoute } from '@angular/router';
import { ItemSearchResult } from '../../shared/object-collection/shared/item-search-result.model';
import { RouteService } from '../../shared/route.service'; import { RouteService } from '../../shared/route.service';
import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model'; import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
import { SortOptions } from '../../core/cache/models/sort-options.model'; import { SortOptions } from '../../core/cache/models/sort-options.model';