From: kashalkar <kiran.kashalkar@riftio.com>
Date: Fri, 28 Oct 2016 17:19:43 +0000 (+0200)
Subject: Merge "Bug 94 - SDN and Cloud/Config-Agent account data inconsistent" into v1.0
X-Git-Tag: v1.0.1~4
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FUI.git;a=commitdiff_plain;h=9a546bd5bcb6db7488f6a4059a356d8beb9b5b11;hp=9c013ddf2d997053c1c8d8bd732275a932ff6b0a

Merge "Bug 94 - SDN and Cloud/Config-Agent account data inconsistent" into v1.0
---

diff --git a/skyquake/framework/widgets/skyquake_container/skyquakeContainerSource.js b/skyquake/framework/widgets/skyquake_container/skyquakeContainerSource.js
index 03bc7efe1..49356a424 100644
--- a/skyquake/framework/widgets/skyquake_container/skyquakeContainerSource.js
+++ b/skyquake/framework/widgets/skyquake_container/skyquakeContainerSource.js
@@ -40,6 +40,7 @@ export default {
                         type: 'GET',
                         // beforeSend: Utils.addAuthorizationStub,
                         success: function(data) {
+                            Utils.detectInactivity();
                             resolve(data);
                         }
                     })
diff --git a/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js b/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js
index 59d2f95d6..a2373e646 100644
--- a/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js
+++ b/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js
@@ -182,7 +182,7 @@ export default function EditDescriptorModelProperties(props) {
 		const onFocus = onFocusPropertyFormInputElement.bind(container, property, path, value);
 		const placeholder = changeCase.title(property.name);
 		const className = ClassNames(property.name + '-input', {'-is-guid': isGuid});
-		const fieldValue = value ? value.constructor.name == "String" ? value : '' : undefined;
+		const fieldValue = value ? (value.constructor.name != "Object") ? value : '' : undefined;
 		if (isEnumeration) {
 			const enumeration = Property.getEnumeration(property, value);
 			const options = enumeration.map((d, i) => {