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

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

Browse Source
revert-dabc3590
dilanua 8 years ago
parent 36eb2e2b16
commit 3a7dbb81ea
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File

30
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
Unescape View File

@ -25,27 +25,27 @@
<tbody> <tbody>
{{#if device.viewModel.deviceIdentifier}} {{#if device.viewModel.deviceIdentifier}}
<tr role="row" class="odd"> <tr role="row" class="odd">
<td class="sorting_1" style="padding:10px 15px;">ID</td> <td class="sorting_1" style="padding:10px 15px; width: 10%;">Device ID</td>
<td style="padding:10px 15px;">{{device.viewModel.deviceIdentifier}}</td> <td style="padding:10px 15px;">{{device.viewModel.deviceIdentifier}}</td>
</tr> </tr>
{{/if}} {{/if}}
{{#if device.viewModel.deviceName}} {{#if device.viewModel.deviceName}}
<tr role="row" class="even"> <tr role="row" class="even">
<td class="sorting_1" style="padding:10px 15px; width: 1%;">Name</td> <td class="sorting_1" style="padding:10px 15px; width: 10%;">Name</td>
<td style="padding:10px 15px;">{{device.viewModel.deviceName}}</td> <td style="padding:10px 15px;">{{device.viewModel.deviceName}}</td>
</tr> </tr>
{{/if}} {{/if}}
{{#if device.viewModel.vendor}} {{#if device.viewModel.vendor}}
{{#if device.viewModel.model}} {{#if device.viewModel.model}}
<tr role="row" class="odd"> <tr role="row" class="odd">
<td class="sorting_1" style="padding:10px 15px;">Model</td> <td class="sorting_1" style="padding:10px 15px; width: 10%;">Model</td>
<td style="padding:10px 15px;">{{device.viewModel.vendor}} {{device.viewModel.model}}</td> <td style="padding:10px 15px;">{{device.viewModel.vendor}} {{device.viewModel.model}}</td>
</tr> </tr>
{{/if}} {{/if}}
{{/if}} {{/if}}
{{#if device.status}} {{#if device.status}}
<tr role="row" class="even"> <tr role="row" class="even">
<td class="sorting_1" style="padding:10px 15px;">Status</td> <td class="sorting_1" style="padding:10px 15px; width: 10%;">Status</td>
<td style="padding:10px 15px;"> <td style="padding:10px 15px;">
{{#equal device.status "ACTIVE"}}<span><i class="fw fw-ok icon-success"></i>&nbsp;&nbsp;Active</span>{{/equal}} {{#equal device.status "ACTIVE"}}<span><i class="fw fw-ok icon-success"></i>&nbsp;&nbsp;Active</span>{{/equal}}
{{#equal device.status "INACTIVE"}}<span><i class="fw fw-warning icon-warning"></i>&nbsp;&nbsp;Inactive</span>{{/equal}} {{#equal device.status "INACTIVE"}}<span><i class="fw fw-warning icon-warning"></i>&nbsp;&nbsp;Inactive</span>{{/equal}}
@ -56,34 +56,46 @@
{{/if}} {{/if}}
{{#if device.viewModel.owner}} {{#if device.viewModel.owner}}
<tr role="row" class="odd"> <tr role="row" class="odd">
<td class="sorting_1" style="padding:10px 15px; width: 1%;">Owner</td> <td class="sorting_1" style="padding:10px 15px; width: 10%;">Owner</td>
<td style="padding:10px 15px;">{{device.viewModel.owner}}</td> <td style="padding:10px 15px;">{{device.viewModel.owner}}</td>
</tr> </tr>
{{/if}} {{/if}}
{{#if device.viewModel.ownership}}
<tr role="row" class="even">
<td class="sorting_1" style="padding:10px 15px; width: 10%;">Ownership</td>
<td style="padding:10px 15px;">{{device.viewModel.ownership}}</td>
</tr>
{{/if}}
{{#if device.viewModel.imei}} {{#if device.viewModel.imei}}
<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; width: 10%;">IMEI</td>
<td style="padding:10px 15px;">{{device.viewModel.imei}}</td> <td style="padding:10px 15px;">{{device.viewModel.imei}}</td>
</tr> </tr>
{{/if}} {{/if}}
{{#if device.viewModel.udid}} {{#if device.viewModel.udid}}
<tr role="row" class="odd"> <tr role="row" class="odd">
<td class="sorting_1" style="padding:10px 15px;">UDID</td> <td class="sorting_1" style="padding:10px 15px; width: 10%;">UDID</td>
<td style="padding:10px 15px;">{{device.viewModel.udid}}</td> <td style="padding:10px 15px;">{{device.viewModel.udid}}</td>
</tr> </tr>
{{/if}} {{/if}}
{{#if device.viewModel.os_build_date}} {{#if device.viewModel.os_build_date}}
<tr role="row" class="even"> <tr role="row" class="even">
<td class="sorting_1" style="padding:10px 15px;">Firmware Build Date</td> <td class="sorting_1" style="padding:10px 15px; width: 10%;">Firmware Build Date</td>
<td style="padding:10px 15px;">{{device.viewModel.os_build_date}}</td> <td style="padding:10px 15px;">{{device.viewModel.os_build_date}}</td>
</tr> </tr>
{{/if}} {{/if}}
{{#if device.viewModel.phoneNumber}} {{#if device.viewModel.phoneNumber}}
<tr role="row" class="odd"> <tr role="row" class="odd">
<td class="sorting_1" style="padding:10px 15px;">Phone Number</td> <td class="sorting_1" style="padding:10px 15px; width: 10%;">Phone Number</td>
<td style="padding:10px 15px;">{{device.viewModel.phoneNumber}}</td> <td style="padding:10px 15px;">{{device.viewModel.phoneNumber}}</td>
</tr> </tr>
{{/if}} {{/if}}
{{#if device.viewModel.lastUpdatedTime}}
<tr role="row" class="even">
<td class="sorting_1" style="padding:10px 15px; width: 10%;">Last Update</td>
<td style="padding:10px 15px;">{{device.viewModel.lastUpdatedTime}}</td>
</tr>
{{/if}}
</tbody> </tbody>
</table> </table>
{{/defineZone}} {{/defineZone}}

4
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
Unescape View File

@ -58,6 +58,10 @@ function onRequest(context) {
viewModel["model"] = device["deviceInfo"]["deviceModel"]; viewModel["model"] = device["deviceInfo"]["deviceModel"];
viewModel["vendor"] = device["deviceInfo"]["vendor"]; viewModel["vendor"] = device["deviceInfo"]["vendor"];
viewModel["owner"] = device["owner"]; viewModel["owner"] = device["owner"];
viewModel["ownership"] = device["ownership"];
viewModel["lastUpdatedTime"] = device["deviceInfo"]["updatedTime"].
substr(0, device["deviceInfo"]["updatedTime"].indexOf("+"));
var osBuildDate = device["properties"]["OS_BUILD_DATE"]; var osBuildDate = device["properties"]["OS_BUILD_DATE"];
if (osBuildDate != null && osBuildDate != "0") { if (osBuildDate != null && osBuildDate != "0") {
viewModel["os_build_date"] = new Date(osBuildDate * 1000); viewModel["os_build_date"] = new Date(osBuildDate * 1000);

Write Preview
Loading…
Cancel
Save