From 153a35821f0d25ce23cca467b76c5a7c5092c744 Mon Sep 17 00:00:00 2001 From: Tal Gitelman Date: Mon, 3 Jul 2017 20:16:55 +0300 Subject: [sdc] - last merges before moving to LF Change-Id: I0df3ec795f0de84229ea4bb4806ec8f959243557 Signed-off-by: Tal Gitelman --- catalog-ui/src/app/ng2/services/properties.service.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'catalog-ui/src/app/ng2/services/properties.service.ts') diff --git a/catalog-ui/src/app/ng2/services/properties.service.ts b/catalog-ui/src/app/ng2/services/properties.service.ts index a22e2aed20..3a02e503fa 100644 --- a/catalog-ui/src/app/ng2/services/properties.service.ts +++ b/catalog-ui/src/app/ng2/services/properties.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { DataTypeModel, PropertyFEModel, PropertyBEModel, SchemaProperty, DerivedFEProperty, DerivedFEPropertyMap, DerivedPropertyType, InputFEModel} from "app/models"; +import { DataTypeModel, PropertyFEModel, PropertyBEModel, SchemaProperty, PropertyDeclareAPIModel, DerivedFEProperty, DerivedFEPropertyMap, DerivedPropertyType, InputFEModel} from "app/models"; import { DataTypeService } from "./data-type.service"; import { PROPERTY_TYPES } from "app/utils"; import { ContentAfterLastDotPipe } from "../pipes/contentAfterLastDot.pipe"; @@ -48,14 +48,14 @@ export class PropertiesService { } public getCheckedProperties = (properties: Array): Array => { - let selectedProps: Array = []; + let selectedProps: Array = []; properties.forEach(prop => { if (prop.isSelected && !prop.isDeclared && !prop.isDisabled) { - selectedProps.push(new PropertyBEModel(prop)); + selectedProps.push(new PropertyDeclareAPIModel(prop)); } else if (prop.flattenedChildren) { prop.flattenedChildren.forEach((child) => { if (child.isSelected && !child.isDeclared && !child.isDisabled) { - let childProp = new PropertyBEModel(prop, child); //create it from the parent + let childProp = new PropertyDeclareAPIModel(prop, child); //create it from the parent selectedProps.push(childProp); } }) -- cgit 1.2.3-korg