From: Laurence Maultsby Date: Tue, 13 Dec 2016 14:13:14 +0000 (-0500) Subject: NO TICKET: Support for leaf lists in composer X-Git-Tag: v1.1.0~32 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F06%2F806%2F1;p=osm%2FUI.git NO TICKET: Support for leaf lists in composer Signed-off-by: Laurence Maultsby --- diff --git a/skyquake/plugins/composer/src/src/libraries/model/DescriptorModelMetaProperty.js b/skyquake/plugins/composer/src/src/libraries/model/DescriptorModelMetaProperty.js index efd06c0ff..67f34e29b 100644 --- a/skyquake/plugins/composer/src/src/libraries/model/DescriptorModelMetaProperty.js +++ b/skyquake/plugins/composer/src/src/libraries/model/DescriptorModelMetaProperty.js @@ -1,5 +1,5 @@ /* - * + * * Copyright 2016 RIFT.IO Inc * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,10 +35,10 @@ export default { return /leaf|choice/.test(property.type); }, isList(property = {}) { - return /list|leaf-list/.test(property.type); + return /list|leaf_list/.test(property.type); }, isLeafList(property = {}) { - return property.type === 'leaf-list'; + return property.type === 'leaf_list'; }, isArray(property = {}) { // give '1' or '0..N' or '0..1' or '0..5' determine if represents an array @@ -58,7 +58,7 @@ export default { return /^1/.test(property.cardinality); }, isObject(property = {}) { - return !/^(leaf|leaf-list)$/.test(property.type); + return !/^(leaf|leaf_list)$/.test(property.type); }, isSimpleList(property = {}) { return _.contains(DescriptorModelFields.simpleList, property.name);