From c75126447fae0418293491ea2a38fb03d12b157e Mon Sep 17 00:00:00 2001 From: Idan Amit Date: Wed, 18 Jul 2018 18:29:04 +0300 Subject: Fixed not needed derived from properties Removed derived from property that we're added before Fixed the properties assignments page to work with the new state Change-Id: I36cb09c3e1cb2839e2fac5bd8a7c9c063e36613f Issue-ID: SDC-1514 Signed-off-by: Idan Amit --- catalog-ui/src/app/ng2/services/data-type.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalog-ui/src/app/ng2/services/data-type.service.ts b/catalog-ui/src/app/ng2/services/data-type.service.ts index e2489c6ec2..d79cfc621f 100644 --- a/catalog-ui/src/app/ng2/services/data-type.service.ts +++ b/catalog-ui/src/app/ng2/services/data-type.service.ts @@ -57,7 +57,7 @@ export class DataTypeService { }); } //recurse parent (derivedFrom), in case one of parents contains properties - if (dataTypeObj.derivedFrom && PROPERTY_DATA.ROOT_DATA_TYPE == dataTypeObj.derivedFrom.name) { + if (dataTypeObj.derivedFrom && PROPERTY_DATA.ROOT_DATA_TYPE !== dataTypeObj.derivedFrom.name) { this.getDerivedDataTypeProperties(dataTypeObj.derivedFrom, propertiesArray, parentName); } } -- cgit 1.2.3-korg