hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-09 11:03:05 +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.spec.ts
	src/app/+search-page/search-page.component.ts
	src/app/+search-page/search-results/search-results.component.html
	src/app/+search-page/search-service/search.service.ts
	src/app/shared/search-form/search-form.component.html
	src/app/shared/shared.module.ts
This commit is contained in:
Lotte Hofstede
2017-11-08 16:08:59 +01:00
parent 91f4ee6ed1 41ac403553
commit 1ff29621af
79 changed files with 1899 additions and 895 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/shared/shared.module.ts
View File

@@ -30,6 +30,7 @@ import { SearchResultListElementComponent } from '../object-list/search-result-l
import { SearchFormComponent } from './search-form/search-form.component';
import { WrapperListElementComponent } from '../object-list/wrapper-list-element/wrapper-list-element.component';
import { ViewModeSwitchComponent } from './view-mode-switch/view-mode-switch.component';
import { VarDirective } from './utils/var.directive';
const MODULES = [
// Do NOT include UniversalModule, HttpModule, or JsonpModule here
@@ -77,6 +78,10 @@ const ENTRY_COMPONENTS = [
SearchResultListElementComponent
];
const DIRECTIVES = [
VarDirective
];
@NgModule({
imports: [
...MODULES
@@ -84,6 +89,7 @@ const ENTRY_COMPONENTS = [
declarations: [
...PIPES,
...COMPONENTS,
...DIRECTIVES,
...ENTRY_COMPONENTS,
...DIRECTIVES
],