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 <ia096e@intl.att.com>

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 e2489c6..d79cfc6 100644 (file)
--- 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);
         }
     }