Merge pull request #832 from rasika/geo-fencing

Hiding geo dashboard tools when GeoLocationConfiguration is Disabled

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/geo/location/GeoLocationConfiguration.java

@@ -28,6 +28,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 public class GeoLocationConfiguration {
 
     private boolean publishLocationOperationResponse;
+    private boolean isEnabled;
 
     public boolean getPublishLocationOperationResponse() {
         return publishLocationOperationResponse;
@@ -37,4 +38,13 @@ public class GeoLocationConfiguration {
     public void setPublishLocationOperationResponse(boolean publishLocationOperationResponse) {
         this.publishLocationOperationResponse = publishLocationOperationResponse;
     }
+
+    public boolean getIsEnabled() {
+        return isEnabled;
+    }
+
+    @XmlElement(name = "isEnabled", required = true)
+    public void setEnabled(boolean enabled) {
+        isEnabled = enabled;
+    }
 }

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/conf-reader/main.js

@@ -56,6 +56,8 @@ var conf = function () {
                 }
             }
         );
+        var DeviceConfigurationManager = Packages.org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager;
+        conf["serverConfig"] = DeviceConfigurationManager.getInstance().getDeviceManagementConfig();
         application.put("CONF", conf);
     }
     return conf;

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.js

@@ -52,6 +52,6 @@ function onRequest(context) {
     } else {
         viewModel.lastLocation = stringify({});
     }
-    viewModel.showGeoFencingTools = true;
+    viewModel.showGeoFencingTools = devicemgtProps.serverConfig.geoLocationConfiguration.isEnabled;
     return viewModel;
 }

features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml

@@ -79,6 +79,7 @@
         <ExpiryTime>600</ExpiryTime>
     </DeviceCacheConfiguration>
     <GeoLocationConfiguration>
+        <isEnabled>false</isEnabled>
         <PublishLocationOperationResponse>false</PublishLocationOperationResponse>
     </GeoLocationConfiguration>
 </DeviceMgtConfiguration>