arshana790
/
device-mgt-plugins-fork
forked from community/device-mgt-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
Fix incorrect device view issue in android.

See merge request entgra/carbon-device-mgt-plugins!87
revert-dabc3590
Saad Sahibjan 5 years ago
parent 8e3fe481a1 1960c01462
commit 43d855ec09
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File

5
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java
Unescape View File

@ -23,6 +23,7 @@ import org.wso2.carbon.device.mgt.common.configuration.mgt.AmbiguousConfiguratio
import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationManagementException;
import org.wso2.carbon.device.mgt.common.configuration.mgt.DeviceConfiguration;
import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
import org.wso2.carbon.device.mgt.common.device.details.DeviceData;
import org.wso2.carbon.device.mgt.common.license.mgt.License;
import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;
import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
@ -144,6 +145,10 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
return null;
}
@Override public Device getDevice(DeviceData deviceData, boolean b) throws DeviceManagementException {
return null;
}
@Override
public List<Device> getDevicesBasedOnProperties(Map map) throws DeviceManagementException {
return null;

3
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.js
Unescape View File

@ -21,6 +21,7 @@ function onRequest(context) {
var deviceType = context["uriParams"]["deviceType"];
var deviceId = request.getParameter("id");
var owner = request.getParameter("owner");
var ownership = request.getParameter("ownership");
var deviceViewData = {};
var devicemgtProps = require("/app/modules/conf-reader/main.js")["conf"];
var carbonServer = require("carbon").server;
@ -28,7 +29,7 @@ function onRequest(context) {
if (deviceType && deviceId) {
var deviceModule = require("/app/modules/business-controllers/device.js")["deviceModule"];
var response = deviceModule.viewDevice(deviceType, deviceId, owner);
var response = deviceModule.viewDevice(deviceType, deviceId, owner, ownership);
if (response["status"] === "success") {
deviceViewData["deviceFound"] = true;
deviceViewData["isAuthorized"] = true;

2
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/device-detail.js
Unescape View File

@ -211,7 +211,7 @@ var InitiateViewOption = null;
order: [],
ajax: {
url: "/devicemgt/api/operation/paginate",
data: {deviceId: deviceIdentifier, deviceType: deviceType, owner: owner},
data: {deviceId: deviceIdentifier, deviceType: deviceType, owner: owner, ownership: ownership},
dataSrc: function (json) {
$("#operations-spinner").addClass("hidden");
$("#operations-log-container").empty();

5
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.v09.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java
Unescape View File

@ -23,6 +23,7 @@ import org.wso2.carbon.device.mgt.common.configuration.mgt.AmbiguousConfiguratio
import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationManagementException;
import org.wso2.carbon.device.mgt.common.configuration.mgt.DeviceConfiguration;
import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
import org.wso2.carbon.device.mgt.common.device.details.DeviceData;
import org.wso2.carbon.device.mgt.common.license.mgt.License;
import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;
import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
@ -144,6 +145,10 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
return null;
}
@Override public Device getDevice(DeviceData deviceData, boolean b) throws DeviceManagementException {
return null;
}
@Override
public List<Device> getDevicesBasedOnProperties(Map map) throws DeviceManagementException {
return null;

Write Preview
Loading…
Cancel
Save