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 pull request #228 from charithag/master

Browse Source 
Fix UI issues occured after merge with emm ui
This commit is contained in:
Milan Perera 2016-04-19 15:11:19 +05:30
commit e56e3d0b85
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.js
View File

@ -21,7 +21,7 @@ function onRequest(context) {
var deviceType = context.uriParams.deviceType; var deviceType = context.uriParams.deviceType;
var deviceId = request.getParameter("id"); var deviceId = request.getParameter("id");
if (deviceType != null && deviceType != undefined && deviceId != null && deviceId != undefined) { if (deviceType && deviceId) {
var deviceModule = require("/app/modules/device.js").deviceModule; var deviceModule = require("/app/modules/device.js").deviceModule;
var device = deviceModule.viewDevice(deviceType, deviceId); var device = deviceModule.viewDevice(deviceType, deviceId);

8
components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.ui/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.device.operation-bar/operation-bar.js
View File

@ -20,12 +20,6 @@ function onRequest(context) {
var log = new Log("operation.js"); var log = new Log("operation.js");
var operationModule = require("/app/modules/operation.js").operationModule; var operationModule = require("/app/modules/operation.js").operationModule;
var device = context.unit.params.device; var device = context.unit.params.device;
var controlOperations; var controlOperations = operationModule.getControlOperations(device.type);
try {
controlOperations = operationModule.getControlOperations(device.type);
}catch(e){
log.error("Control operation loading failed.");
controlOperations = null;
}
return {"control_operations": controlOperations, "device": device}; return {"control_operations": controlOperations, "device": device};
} }