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 03bc7ef..49356a4 100644 (file)
--- 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 59d2f95..a2373e6 100644 (file)
--- 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) => {