Merge pull request #626 from Kamidu/cloud-3.1.0

remove the cloud related config from config.json

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json

@@ -1,26 +1,6 @@
 {
   "appContext": "/devicemgt/",
   "isCloud": true,
-  "cloudConfig": {
-    "upgradeNowURL": "https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/payment-plans.jag?cloud-type=device_cloud",
-    "monetizationURL": "https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/monetization-dashboard.jag",
-    "requestExtensionURL": "https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/contact-us.jag?cloud-type=device_cloud&request-extension=true",
-    "publisherURL": "",
-    "storeURL": "",
-    "contactUsURL": "https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/contact-us.jag",
-    "apiCloudDocURL": "https://docs.wso2.com/display/APICloud/WSO2+API+Cloud+Documentation",
-    "appCloudDocURL": "https://docs.wso2.com/display/AppCloud/WSO2+App+Cloud+Documentation",
-    "deviceCloudDocURL": "https://docs.wso2.com/display/DeviceCloud/WSO2+Device+Cloud+Documentation",
-    "apiCloudWalkthroughURL": "https://api.clouddev.wso2.com/publisher?interactiveTutorial=true",
-    "profileURL": "https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/user-profile.jag",
-    "changePasswordURL": "https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/change-password.jag",
-    "logoutURL": "https://devicemgt.cloud.wso2.com/devicemgt/logout",
-    "apiCloudURL": "",
-    "appCloudURL": "",
-    "deviceCloudURL": "",
-    "oraganizationURL": "https://cloudmgt.cloud.wso2.com/cloudmgt/site/pages/organization.jag",
-    "membersURL": "https://cloudmgt.cloud.wso2.com/cloudmgt/site/pages/user.jag"
-  },
   "httpsURL": "https://%iot.gateway.host%:%iot.gateway.https.port%",
   "httpURL": "http://%iot.gateway.host%:%iot.gateway.http.port",
   "wssURL": "https://%iot.analytics.host%:%iot.analytics.https.port%",

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.cloud.user-menu/user-menu.js

@@ -40,7 +40,7 @@ function onRequest(context) {
                 viewModal.Main[key].dropDown[sub_key].dropDown == true ||
                 viewModal.Main[key].dropDown[sub_key].dropDown == "true") {
                 viewModal.Main[key].dropDown[sub_key].dropDown = true;
-                temp = true;
+                tempDropDownCheck = true;
             } else {
                 viewModal.Main[key].dropDown[sub_key].dropDown = false;
             }
@@ -65,7 +65,7 @@ function onRequest(context) {
     tempDropDownCheck = false;
     for (var key in viewModal.Expand) {
         for (var sub_key in viewModal.Expand[key]) {
-            if( viewModal.Expand[key][sub_key].dropDown == null ||
+            if (viewModal.Expand[key][sub_key].dropDown == null ||
                 viewModal.Expand[key][sub_key].dropDown == true ||
                 viewModal.Expand[key][sub_key].dropDown == "true") {
                 viewModal.Expand[key][sub_key].dropDown = true;