mirror of
https://repository.entgra.net/community/device-mgt-plugins.git
synced 2025-09-16 23:42:15 +00:00
Merge branch 'cloud-3.1.0' into cloud-3.1.0
This commit is contained in:
Imesh Chandrasiri
GitHub
commit
37b032d710
@ -56,7 +56,7 @@ import javax.ws.rs.core.Response;
|
||||
}
|
||||
),
|
||||
tags = {
|
||||
@Tag(name = "android_sense", description = "")
|
||||
@Tag(name = "android_sense,device_management", description = "")
|
||||
}
|
||||
)
|
||||
@Scopes(
|
||||
|
||||
@ -40,7 +40,7 @@ import javax.ws.rs.core.Response;
|
||||
}
|
||||
),
|
||||
tags = {
|
||||
@Tag(name = "arduino", description = "")
|
||||
@Tag(name = "arduino,device_management", description = "")
|
||||
}
|
||||
)
|
||||
@Scopes(
|
||||
|
||||
@ -39,7 +39,7 @@ import javax.ws.rs.core.Response;
|
||||
}
|
||||
),
|
||||
tags = {
|
||||
@Tag(name = "raspberrypi", description = "")
|
||||
@Tag(name = "raspberrypi,device_management", description = "")
|
||||
}
|
||||
)
|
||||
@Scopes(
|
||||
|
||||
@ -45,7 +45,7 @@ import javax.ws.rs.core.Response;
|
||||
}
|
||||
),
|
||||
tags = {
|
||||
@Tag(name = "virtual_firealarm", description = "")
|
||||
@Tag(name = "virtual_firealarm,device_management", description = "")
|
||||
}
|
||||
)
|
||||
@Scopes(
|
||||
|
||||
@ -58,7 +58,7 @@ import java.util.List;
|
||||
}
|
||||
),
|
||||
tags = {
|
||||
@Tag(name = "android", description = "")
|
||||
@Tag(name = "android,device_management", description = "")
|
||||
}
|
||||
)
|
||||
@Path("/admin/devices")
|
||||
|
||||
@ -56,7 +56,7 @@ import java.util.List;
|
||||
}
|
||||
),
|
||||
tags = {
|
||||
@Tag(name = "android", description = "")
|
||||
@Tag(name = "android,device_management", description = "")
|
||||
}
|
||||
)
|
||||
@Api(value = "Android Device Management",
|
||||
|
||||
@ -55,7 +55,7 @@ import javax.ws.rs.core.Response;
|
||||
}
|
||||
),
|
||||
tags = {
|
||||
@Tag(name = "android", description = "")
|
||||
@Tag(name = "android,device_management", description = "")
|
||||
}
|
||||
)
|
||||
@Api(value = "Android Configuration Management", description = "This API carries all the resource used to mange the Android platform configurations.")
|
||||
|
||||
@ -53,7 +53,7 @@ import javax.ws.rs.core.Response;
|
||||
}
|
||||
),
|
||||
tags = {
|
||||
@Tag(name = "android", description = "")
|
||||
@Tag(name = "android,device_management", description = "")
|
||||
}
|
||||
)
|
||||
@Api(value = "Event Receiver", description = "Event publishing/retrieving related APIs. To enable event publishing/retrieving you need to" +
|
||||
|
||||
@ -336,16 +336,18 @@
|
||||
<div id="device-location"
|
||||
data-lat="{{device.location.latitude}}"
|
||||
data-long="{{device.location.longitude}}"
|
||||
data-locations = "{{device.locationHistory}}">
|
||||
data-locations="{{device.locationHistory}}">
|
||||
</div>
|
||||
<br/>
|
||||
<a class="padding-left" target="_blank"
|
||||
href="{{portalUrl}}/portal/dashboards/geo-dashboard/?GLOBAL-STATE={{anchor}}">
|
||||
{{#unless isCloud}}
|
||||
<a class="padding-left" target="_blank"
|
||||
href="{{portalUrl}}/portal/dashboards/geo-dashboard/?GLOBAL-STATE={{anchor}}">
|
||||
<span class="fw-stack">
|
||||
<i class="fw fw-circle-outline fw-stack-2x"></i>
|
||||
<i class="fw fw-map-location fw-stack-1x"></i>
|
||||
</span> Add Geo Fencing
|
||||
</a>
|
||||
</span> Add Geo Fencing
|
||||
</a>
|
||||
{{/unless}}
|
||||
{{else}}
|
||||
<div id="map-error" class="message message-warning">
|
||||
<h4 class="remove-margin">
|
||||
|
||||
@ -213,6 +213,7 @@ function onRequest(context) {
|
||||
deviceViewData["autoCompleteParams"] = autoCompleteParams;
|
||||
|
||||
deviceViewData["portalUrl"] = devicemgtProps['portalURL'];
|
||||
deviceViewData["isCloud"] = devicemgtProps['isCloud'];
|
||||
deviceViewData["anchor"] = encodeURI(JSON.stringify({ "device" : { "id" : deviceId, "type" : deviceType}}));
|
||||
return deviceViewData;
|
||||
}
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
var map;
|
||||
|
||||
function loadLeafletMap() {
|
||||
|
||||
|
||||
var deviceLocationID = "#device-location",
|
||||
locations = $(deviceLocationID).data("locations"),
|
||||
location_lat = $(deviceLocationID).data("lat"),
|
||||
@ -28,7 +28,7 @@ function loadLeafletMap() {
|
||||
zoomLevel = 13,
|
||||
tileSet = "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
|
||||
attribution = "© <a href='https://openstreetmap.org/copyright'>OpenStreetMap</a> contributors";
|
||||
if (locations) {
|
||||
if (locations && locations.locations.length > 0) {
|
||||
|
||||
var locationSets = locations.locations;
|
||||
map = L.map(container).setView([locationSets[0].lat, locationSets[0].lng], zoomLevel);
|
||||
|
||||
@ -95,9 +95,6 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="col-xs-12 col-sm-12 col-md-8 col-lg-12 padding-double grey-bg">
|
||||
<h3 class="uppercase">Prepare</h3><hr>
|
||||
<ul class="list-unstyled">
|
||||
|
||||
@ -34,6 +34,7 @@ function onRequest(context){
|
||||
// //do nothing.
|
||||
// }
|
||||
//);
|
||||
viewModel["isCloud"] = devicemgtProps["isCloud"];
|
||||
viewModel["hostName"] = devicemgtProps["httpsURL"];
|
||||
viewModel["enrollmentURL"] = devicemgtProps["generalConfig"]["host"] + devicemgtProps["androidEnrollmentDir"];
|
||||
return viewModel;
|
||||
|
||||
@ -62,7 +62,7 @@ import javax.ws.rs.core.Response;
|
||||
}
|
||||
),
|
||||
tags = {
|
||||
@Tag(name = "windows", description = "")
|
||||
@Tag(name = "windows,device_management", description = "")
|
||||
}
|
||||
)
|
||||
@Api(value = "Windows Configuration Management",
|
||||
|
||||
@ -55,7 +55,7 @@ import java.util.List;
|
||||
}
|
||||
),
|
||||
tags = {
|
||||
@Tag(name = "windows", description = "")
|
||||
@Tag(name = "windows,device_management", description = "")
|
||||
}
|
||||
)
|
||||
@Api(value = "Windows Device Management Administrative Service",
|
||||
|
||||
@ -51,7 +51,7 @@ import javax.ws.rs.core.Response;
|
||||
}
|
||||
),
|
||||
tags = {
|
||||
@Tag(name = "windows", description = "")
|
||||
@Tag(name = "windows,device_management", description = "")
|
||||
}
|
||||
)
|
||||
@Api(value = "Windows Binary Security Token Service",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user