From: kashalkar <kiran.kashalkar@riftio.com>
Date: Thu, 4 May 2017 19:23:58 +0000 (+0200)
Subject: Merge changes I708f8fc2,Ife664a90,I5ea07463 into projects
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FUI.git;a=commitdiff_plain;h=b78cde7361f4c72441e3dae0b14e116f62895698;hp=90aab2d191f07689f2b5249c0a8e96d2bb10acea

Merge changes I708f8fc2,Ife664a90,I5ea07463 into projects

* changes:
  Logging page only for platform roles
  User Enable/Disable
  Allow for project description change
---

diff --git a/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js b/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js
index c4b817eb4..ed29b265a 100644
--- a/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js
+++ b/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js
@@ -512,7 +512,7 @@ export default function EditDescriptorModelProperties(props) {
 			if(fieldProperties) {
 				//Check each case statement in model and see if it is present in container model.
 				cases.map(function(c){
-					if(fieldProperties.hasOwnProperty(c.optionValue.split('.')[1])) {
+					if(c.optionValue && fieldProperties.hasOwnProperty(c.optionValue.split('.')[1])) {
 						utils.assignPathValue(container.model, ['uiState.choice', pathToChoice, 'selected'].join('.'), c.optionValue);
 					}
 				});