mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-12 04:23:04 +00:00
#150 Fixing rebase errors
This commit is contained in:
@@ -12,6 +12,8 @@ import { SearchService } from './search-service/search.service';
|
||||
import { pushInOut } from '../shared/animations/push';
|
||||
import { HostWindowService } from '../shared/host-window.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.
|
||||
@@ -58,7 +60,7 @@ export class SearchPageComponent implements OnInit, OnDestroy {
|
||||
pagination.pageSize = 10;
|
||||
|
||||
const sort: SortOptions = new SortOptions();
|
||||
this.sortConfig=sort;
|
||||
this.sortConfig = sort;
|
||||
this.searchOptions = this.service.searchOptions;
|
||||
}
|
||||
|
||||
@@ -81,7 +83,6 @@ export class SearchPageComponent implements OnInit, OnDestroy {
|
||||
// pageSizeOptions = [9, 18, 27, 36 , 45, 54, 63, 72];
|
||||
}
|
||||
|
||||
|
||||
const sortDirection = +params.sortDirection || this.searchOptions.sort.direction;
|
||||
const pagination = Object.assign({},
|
||||
this.searchOptions.pagination,
|
||||
|
@@ -15,7 +15,6 @@ import { FacetValue } from './facet-value.model';
|
||||
import { ItemSearchResult } from '../../shared/object-collection/shared/item-search-result.model';
|
||||
import { ViewMode } from '../../+search-page/search-options.model';
|
||||
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 { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
|
||||
import { SortOptions } from '../../core/cache/models/sort-options.model';
|
||||
|
Reference in New Issue
Block a user