X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=skyquake%2Fplugins%2Fcomposer%2Fsrc%2Fsrc%2Fcomponents%2FEditDescriptorModelProperties.js;h=651c40d7b11fb4132cab9ab0b82418ad9dbfd975;hb=15999cf835be1475fd72fddcfb34831f4173eb92;hp=c923ede7f8b7e85278c9fef63fe3d9c45421006c;hpb=481d8d50316dfa7d141d5eb08ce2abf43cebad54;p=osm%2FUI.git
diff --git a/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js b/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js
index c923ede7f..651c40d7b 100644
--- a/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js
+++ b/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js
@@ -324,7 +324,7 @@ export default function EditDescriptorModelProperties(props) {
// We stick in a string when the user actually sets it to simplify things
// but the correct thing happens when we serialize to user data
let isEmptyLeafPresent = (value === EMPTY_LEAF_PRESENT || value === null);
- let present = isEmptyLeafPresent ? EMPTY_LEAF_PRESENT : "";
+ let present = isEmptyLeafPresent ? EMPTY_LEAF_PRESENT : [null];
const options = [
,
@@ -538,7 +538,7 @@ export default function EditDescriptorModelProperties(props) {
selectedOptionValue = utils.resolvePath(container.model, ['uiState.choice', pathToChoice, 'selected'].join('.'));
} else {
property.properties.map(function(p) {
- let pname = p.properties[0].name;
+ let pname = p.properties[0] && p.properties[0].name;
if(container.model.hasOwnProperty(pname)) {
utils.assignPathValue(container.model, ['uiState.choice', pathToChoice, 'selected'].join('.'), [p.name, pname].join('.'));
}
@@ -747,7 +747,7 @@ export default function EditDescriptorModelProperties(props) {
value = utils.resolvePath(container.model, ['uiState.choice'].concat(path, 'selected').join('.'));
if(!value) {
property.properties.map(function(p) {
- let pname = p.properties[0].name;
+ let pname = p.properties[0] && p.properties[0].name;
if(container.model.hasOwnProperty(pname)) {
value = container.model[pname];
}