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

Merge remote-tracking branch 'remotes/origin/master' into shibboleth

Browse Source 
# Conflicts:
#	src/app/app-routing.module.ts
#	src/app/core/auth/auth.service.ts
#	src/app/shared/shared.module.ts
This commit is contained in:
Giuseppe Digilio
2020-03-23 10:36:19 +01:00
parent b2234e45e9 103605c36e
commit 7cf0480098
152 changed files with 5929 additions and 555 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,7 @@ import { NouisliderModule } from 'ng2-nouislider';
import { NgbDatepickerModule, NgbModule, NgbTimepickerModule, NgbTypeaheadModule } from '@ng-bootstrap/ng-bootstrap';
import { TranslateModule } from '@ngx-translate/core';
import { MissingTranslationHandler, TranslateModule } from '@ngx-translate/core';
import { NgxPaginationModule } from 'ngx-pagination';
import { PublicationListElementComponent } from './object-list/item-list-element/item-types/publication/publication-list-element.component';
@@ -178,11 +178,13 @@ import { ExternalSourceEntryImportModalComponent } from './form/builder/ds-dynam
import { ImportableListItemControlComponent } from './object-collection/shared/importable-list-item-control/importable-list-item-control.component';
import { DragDropModule } from '@angular/cdk/drag-drop';
import { ExistingMetadataListElementComponent } from './form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component';
import { ItemVersionsComponent } from './item/item-versions/item-versions.component';
import { SortablejsModule } from 'ngx-sortablejs';
import { LogInContainerComponent } from './log-in/container/log-in-container.component';
import { LogInShibbolethComponent } from './log-in/methods/shibboleth/log-in-shibboleth.component';
import { LogInPasswordComponent } from './log-in/methods/password/log-in-password.component';
import { LogInComponent } from './log-in/log-in.component';
import { MissingTranslationHelper } from './translate/missing-translation.helper';
const MODULES = [
// Do NOT include UniversalModule, HttpModule, or JsonpModule here
@@ -200,7 +202,6 @@ const MODULES = [
NgxPaginationModule,
ReactiveFormsModule,
RouterModule,
TranslateModule,
NouisliderModule,
MomentModule,
TextMaskModule,
@@ -209,7 +210,11 @@ const MODULES = [
];
const ROOT_MODULES = [
TooltipModule.forRoot()
TranslateModule.forChild({
missingTranslationHandler: { provide: MissingTranslationHandler, useClass: MissingTranslationHelper },
useDefaultLang: true
}),
TooltipModule.forRoot(),
];
const PIPES = [
@@ -348,7 +353,9 @@ const COMPONENTS = [
ExistingMetadataListElementComponent,
LogInShibbolethComponent,
LogInPasswordComponent,
LogInContainerComponent
LogInContainerComponent,
ItemVersionsComponent,
PublicationSearchResultListElementComponent,
];
const ENTRY_COMPONENTS = [
@@ -413,7 +420,8 @@ const ENTRY_COMPONENTS = [
DsDynamicLookupRelationExternalSourceTabComponent,
ExternalSourceEntryImportModalComponent,
LogInPasswordComponent,
LogInShibbolethComponent
LogInShibbolethComponent,
ItemVersionsComponent,
];
const SHARED_ITEM_PAGE_COMPONENTS = [
@@ -446,8 +454,8 @@ const DIRECTIVES = [
@NgModule({
imports: [
...ROOT_MODULES,
...MODULES,
...ROOT_MODULES
],
declarations: [
...PIPES,
@@ -455,8 +463,7 @@ const DIRECTIVES = [
...DIRECTIVES,
...ENTRY_COMPONENTS,
...SHARED_ITEM_PAGE_COMPONENTS,
PublicationSearchResultListElementComponent,
ExistingMetadataListElementComponent
],
providers: [
...PROVIDERS