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

rebase

Browse Source
This commit is contained in:
Kristof De Langhe
2018-03-29 15:39:59 +02:00
parent c40cefbef6
commit 70c36f7fef
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
View File

@@ -1,5 +1,5 @@
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { MetadataRegistryService } from '../../../core/metadata/metadataregistry.service'; import { RegistryService } from '../../../core/registry/registry.service';
import { Observable } from 'rxjs/Observable'; import { Observable } from 'rxjs/Observable';
import { RemoteData } from '../../../core/data/remote-data'; import { RemoteData } from '../../../core/data/remote-data';
import { PaginatedList } from '../../../core/data/paginated-list'; import { PaginatedList } from '../../../core/data/paginated-list';
@@ -13,8 +13,8 @@ export class MetadataRegistryComponent {
metadataSchemas: Observable<RemoteData<PaginatedList<MetadataSchema>>>; metadataSchemas: Observable<RemoteData<PaginatedList<MetadataSchema>>>;
constructor(private metadataRegistryService: MetadataRegistryService) { constructor(private registryService: RegistryService) {
this.metadataSchemas = this.metadataRegistryService.getMetadataSchemas(); this.metadataSchemas = this.registryService.getMetadataSchemas();
} }
} }

8
src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
View File

@@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { MetadataRegistryService } from '../../../core/metadata/metadataregistry.service'; import { RegistryService } from '../../../core/registry/registry.service';
import { ActivatedRoute } from '@angular/router'; import { ActivatedRoute } from '@angular/router';
import { Observable } from 'rxjs/Observable'; import { Observable } from 'rxjs/Observable';
import { RemoteData } from '../../../core/data/remote-data'; import { RemoteData } from '../../../core/data/remote-data';
@@ -18,7 +18,7 @@ export class MetadataSchemaComponent implements OnInit {
metadataSchema: Observable<RemoteData<MetadataSchema>>; metadataSchema: Observable<RemoteData<MetadataSchema>>;
metadataFields: Observable<RemoteData<PaginatedList<MetadataField>>>; metadataFields: Observable<RemoteData<PaginatedList<MetadataField>>>;
constructor(private metadataRegistryService: MetadataRegistryService, private route: ActivatedRoute) { constructor(private registryService: RegistryService, private route: ActivatedRoute) {
} }
@@ -29,10 +29,10 @@ export class MetadataSchemaComponent implements OnInit {
} }
initialize(params) { initialize(params) {
this.metadataSchema = this.metadataRegistryService.getMetadataSchemaByName(params.schemaName); this.metadataSchema = this.registryService.getMetadataSchemaByName(params.schemaName);
this.metadataSchema.subscribe((value) => { this.metadataSchema.subscribe((value) => {
const schema = value.payload; const schema = value.payload;
this.metadataFields = this.metadataRegistryService.getMetadataFieldsBySchema(schema); this.metadataFields = this.registryService.getMetadataFieldsBySchema(schema);
this.namespace = { namespace: value.payload.namespace }; this.namespace = { namespace: value.payload.namespace };
}); });
} }

6
src/app/core/metadata/metadataregistry.service.ts → src/app/core/registry/registry.service.ts
View File

@@ -2,12 +2,12 @@ import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/Observable'; import { Observable } from 'rxjs/Observable';
import { RemoteData } from '../data/remote-data'; import { RemoteData } from '../data/remote-data';
import { PaginatedList } from '../data/paginated-list'; import { PaginatedList } from '../data/paginated-list';
import { MetadataSchema } from './metadataschema.model';
import { MetadataField } from './metadatafield.model';
import { PageInfo } from '../shared/page-info.model'; import { PageInfo } from '../shared/page-info.model';
import { MetadataSchema } from '../metadata/metadataschema.model';
import { MetadataField } from '../metadata/metadatafield.model';
Injectable() Injectable()
export class MetadataRegistryService { export class RegistryService {
metadataSchemas: MetadataSchema[]; metadataSchemas: MetadataSchema[];
metadataFields: MetadataField[]; metadataFields: MetadataField[];