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

Fix for JIRA: https://wso2.org/jira/browse/EMM-1614

Browse Source
This commit is contained in:
dilanua 2016-09-22 22:59:42 +05:30
parent f5d95f0695
commit f47a1cdc55
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.hbs
View File

@ -23,16 +23,20 @@
{{#defineZone "device-detail-properties"}} {{#defineZone "device-detail-properties"}}
<table class="table table-responsive table-striped" id="members"> <table class="table table-responsive table-striped" id="members">
<tbody> <tbody>
<tr role="row" class="even"> {{#if device.viewModel.vendor}}
<td class="sorting_1" style="padding:10px 15px; width: 1%;">Device</td> <tr role="row" class="even">
<td style="padding:10px 15px;">{{device.viewModel.vendor}} {{device.properties.model}}</td> <td class="sorting_1" style="padding:10px 15px; width: 1%;">Device</td>
</tr> <td style="padding:10px 15px;">{{device.viewModel.deviceName}}</td>
{{#if device.viewModel.model}}
<tr role="row" class="odd">
<td class="sorting_1" style="padding:10px 15px;">Model</td>
<td style="padding:10px 15px;">{{device.viewModel.model}}</td>
</tr> </tr>
{{/if}} {{/if}}
{{#if device.viewModel.vendor}}
{{#if device.viewModel.model}}
<tr role="row" class="odd">
<td class="sorting_1" style="padding:10px 15px;">Model</td>
<td style="padding:10px 15px;">{{device.viewModel.vendor}} {{device.viewModel.model}}</td>
</tr>
{{/if}}
{{/if}}
<tr role="row" class="even"> <tr role="row" class="even">
<td class="sorting_1" style="padding:10px 15px;">IMEI</td> <td class="sorting_1" style="padding:10px 15px;">IMEI</td>
<td style="padding:10px 15px;">{{device.viewModel.imei}}</td> <td style="padding:10px 15px;">{{device.viewModel.imei}}</td>

2
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.js
View File

@ -52,6 +52,8 @@ function onRequest(context) {
longitude: device["properties"]["LONGITUDE"] longitude: device["properties"]["LONGITUDE"]
}; };
} else if (device["type"] == "android") { } else if (device["type"] == "android") {
viewModel["deviceName"] = device["name"];
viewModel["deviceIdentifier"] = device["deviceIdentifier"];
viewModel["imei"] = device["properties"]["IMEI"]; viewModel["imei"] = device["properties"]["IMEI"];
viewModel["model"] = device["deviceInfo"]["deviceModel"]; viewModel["model"] = device["deviceInfo"]["deviceModel"];
viewModel["vendor"] = device["deviceInfo"]["vendor"]; viewModel["vendor"] = device["deviceInfo"]["vendor"];