community/device-mgt-plugins
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-plugins.git synced 2025-09-16 23:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/wso2/product-mdm

Browse Source
This commit is contained in:
inosh-perera 2015-01-27 23:32:57 +05:30
commit 88cd9826df
3 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
product/modules/distribution/src/repository/jaggeryapps/cdm/client/javascript/main.js
View File

@ -17,7 +17,7 @@
*/ */
function identifierFormatter(value, row, index) { function identifierFormatter(value, row, index) {
return [ return [
'<a class="like" href="/cdm/devices/' + row["deviceType"] + '/' + value + '" title="Like">', '<a class="like" href="/cdm/devices/' + row["deviceType"] + '/' + escape(value) + '" title="Like">',
value, value,
'</a>' '</a>'
].join(''); ].join('');
@ -27,7 +27,7 @@ var currentDeviceOperation;
var currentDevice; var currentDevice;
var currentDeviceType; var currentDeviceType;
function performOperation(){ function performOperation(){
currentDevice = $("#deviceMain").data("deviceid"); currentDevice = escape($("#deviceMain").data("deviceid"));
currentDeviceType = $("#deviceMain").data("devicetype"); currentDeviceType = $("#deviceMain").data("devicetype");
$.post("/cdm/api/operation/"+currentDeviceType+"/"+currentDevice+"/"+currentDeviceOperation,function(){ $.post("/cdm/api/operation/"+currentDeviceType+"/"+currentDevice+"/"+currentDeviceOperation,function(){
$('#confirmModel').modal('hide'); $('#confirmModel').modal('hide');

42
product/modules/distribution/src/repository/jaggeryapps/cdm/modules/device.js
View File

@ -26,6 +26,14 @@ var ArrayList = Packages.java.util.ArrayList;
var log = new Log(); var log = new Log();
var deviceManagementService = utility.getDeviceManagementService(); var deviceManagementService = utility.getDeviceManagementService();
var unspecifiedFilter = function(prop){
if(prop==null){
return "Unspecified";
}else{
return prop;
}
}
var listDevices = function () { var listDevices = function () {
var devices = deviceManagementService.getAllDevices("android"); var devices = deviceManagementService.getAllDevices("android");
var deviceList = []; var deviceList = [];
@ -34,14 +42,14 @@ var listDevices = function () {
var propertiesList = DeviceManagerUtil.convertPropertiesToMap(device.getProperties()); var propertiesList = DeviceManagerUtil.convertPropertiesToMap(device.getProperties());
deviceList.push({ deviceList.push({
"identifier": device.getDeviceIdentifier(), "identifier": unspecifiedFilter(device.getDeviceIdentifier()),
"name": device.getName(), "name": unspecifiedFilter(device.getName()),
"ownership": device.getOwnership(), "ownership": unspecifiedFilter(device.getOwnership()),
"owner": device.getOwner(), "owner": unspecifiedFilter(device.getOwner()),
"deviceType": device.getType(), "deviceType": unspecifiedFilter(device.getType()),
"vendor": propertiesList.get("vendor"), "vendor": unspecifiedFilter(propertiesList.get("vendor")),
"model": propertiesList.get("model"), "model": unspecifiedFilter(propertiesList.get("model")),
"osVersion": propertiesList.get("osVersion") "osVersion": unspecifiedFilter(propertiesList.get("osVersion"))
}); });
} }
return deviceList; return deviceList;
@ -94,17 +102,17 @@ var viewDevice = function(type, deviceId){
var entry = iterator.next(); var entry = iterator.next();
var key = entry.getKey(); var key = entry.getKey();
var value = entry.getValue(); var value = entry.getValue();
properties[key]= value; properties[key]= unspecifiedFilter(value);
} }
return { return {
"identifier": device.getDeviceIdentifier(), "identifier": unspecifiedFilter(device.getDeviceIdentifier()),
"name": device.getName(), "name": unspecifiedFilter(device.getName()),
"ownership": device.getOwnership(), "ownership": unspecifiedFilter(device.getOwnership()),
"owner": device.getOwner(), "owner": unspecifiedFilter(device.getOwner()),
"deviceType": device.getType(), "deviceType": unspecifiedFilter(device.getType()),
"vendor": propertiesList.get("vendor"), "vendor": unspecifiedFilter(propertiesList.get("vendor")),
"model": propertiesList.get("model"), "model": unspecifiedFilter(propertiesList.get("model")),
"osVersion": propertiesList.get("osVersion"), "osVersion": unspecifiedFilter(propertiesList.get("osVersion")),
"properties": properties "properties": properties
}; };
} }

11
product/modules/distribution/src/repository/modules/sso/module.xml
View File

@ -1,7 +1,6 @@
<module name="sso" expose="true" xmlns="http://wso2.org/projects/jaggery/module.xml"> <module name="sso" xmlns="http://wso2.org/projects/jaggery/module.xml">
<hostObject> <script>
<className>org.wso2.carbon.hostobjects.sso.SAMLSSORelyingPartyObject</className> <name>client</name>
<name>SSORelyingParty</name> <path>scripts/sso.client.js</path>
</hostObject> </script>
</module> </module>