Merge pull request #352 from Megala21/master

EMM-1626 : Unable to retrieve device location for an enrolled android device

components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/js/load-map.js

@@ -45,7 +45,7 @@ $(document).ready(function () {
         var url = $(this).prop("href");
         var hash = url.substring(url.indexOf("#") + 1);
 
-        if (hash == "device_location") {
+        if (hash == "device_location_tab") {
             if (!map) {
                 loadLeafletMap();
             }

components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.js

@@ -77,6 +77,10 @@ function onRequest(context) {
                     deviceInfo = info;
 
                     if (device["deviceInfo"]) {
+                        viewModel["location"] = {
+                            latitude: device["deviceInfo"]["location"]["latitude"],
+                            longitude: device["deviceInfo"]["location"]["longitude"]
+                        };
                         viewModel["deviceInfo"] = true;
 
                         viewModel["model"] = device["deviceInfo"]["deviceModel"];