From 6cd950924c733b20d0727054b7c8266c23df79ab Mon Sep 17 00:00:00 2001 From: snoop Date: Mon, 3 Jul 2017 16:16:25 +0900 Subject: [PATCH] meta fixed --- src/ts/infra/api/model/Infra.ts | 2 +- src/ts/infra/api/model/InfraOSApplication.ts | 4 +++- src/ts/infra/api/model/InfraOSPort.ts | 1 + src/ts/infra/api/model/InfraService.ts | 1 + src/ts/member/api/model/Member.ts | 5 +++-- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/ts/infra/api/model/Infra.ts b/src/ts/infra/api/model/Infra.ts index 92e1b21..deda835 100644 --- a/src/ts/infra/api/model/Infra.ts +++ b/src/ts/infra/api/model/Infra.ts @@ -1,5 +1,5 @@ - +import MetaInfraType from 'meta/api/model/MetaInfraType'; interface Infra { id: number; diff --git a/src/ts/infra/api/model/InfraOSApplication.ts b/src/ts/infra/api/model/InfraOSApplication.ts index 7ecb263..cce6129 100644 --- a/src/ts/infra/api/model/InfraOSApplication.ts +++ b/src/ts/infra/api/model/InfraOSApplication.ts @@ -1,4 +1,6 @@ +import InfraOS from './InfraOS'; + interface InfraOSApplication { id: number; os: InfraOS; @@ -7,4 +9,4 @@ interface InfraOSApplication { } -export default InfraOS; \ No newline at end of file +export default InfraOSApplication; \ No newline at end of file diff --git a/src/ts/infra/api/model/InfraOSPort.ts b/src/ts/infra/api/model/InfraOSPort.ts index 764b236..a3d0e6e 100644 --- a/src/ts/infra/api/model/InfraOSPort.ts +++ b/src/ts/infra/api/model/InfraOSPort.ts @@ -1,4 +1,5 @@ import InfraOS from './InfraOS'; +import MetaInfraVendor from 'meta/api/model/MetaInfraVendor'; interface InfraOSPort { id: number; diff --git a/src/ts/infra/api/model/InfraService.ts b/src/ts/infra/api/model/InfraService.ts index 2b5b5af..8f6dec9 100644 --- a/src/ts/infra/api/model/InfraService.ts +++ b/src/ts/infra/api/model/InfraService.ts @@ -1,4 +1,5 @@ import InfraHost from './InfraHost'; +import MetaInfraVendor from 'meta/api/model/MetaInfraVendor'; interface InfraService { id: number; diff --git a/src/ts/member/api/model/Member.ts b/src/ts/member/api/model/Member.ts index 43b400f..766d5e0 100644 --- a/src/ts/member/api/model/Member.ts +++ b/src/ts/member/api/model/Member.ts @@ -1,4 +1,5 @@ -import {MemberStatus} from './MemberStatus'; +// import {MemberStatus} from './MemberStatus'; +import MetaMemberStatus from 'meta/api/model/MetaMemberStatus'; interface Member { @@ -8,7 +9,7 @@ interface Member { phone: string; companyName: string; createDate?: Date; - status?: MemberStatus; + status?: MetaMemberStatus; } export default Member;