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 remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Megala 2016-10-07 09:05:01 +05:30
commit f7052ea2e3
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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/public/js/device-detail.js
View File

@ -311,7 +311,9 @@ var InitiateViewOption = null;
$(document).ready(function () { $(document).ready(function () {
$(".device-detail-body").removeClass("hidden"); $(".device-detail-body").removeClass("hidden");
$("#loading-content").remove(); $("#loading-content").remove();
loadOperationBar(deviceType, ownership, operationBarModeConstants.SINGLE); if ($("#tabs").data("status") !=== false) {
loadOperationBar(deviceType, ownership, operationBarModeConstants.SINGLE);
}
loadOperationsLog(false); loadOperationsLog(false);
loadApplicationsList(); loadApplicationsList();
loadPolicyCompliance(); loadPolicyCompliance();

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

@ -50,9 +50,13 @@ function onRequest(context) {
if (filteredDeviceData["enrolmentInfo"]["status"]) { if (filteredDeviceData["enrolmentInfo"]["status"]) {
viewModel["status"] = filteredDeviceData["enrolmentInfo"]["status"]; viewModel["status"] = filteredDeviceData["enrolmentInfo"]["status"];
viewModel.isActive = false ; viewModel.isActive = false ;
viewModel.isNotRemoved = true;
if (filteredDeviceData["enrolmentInfo"]["status"]== "ACTIVE") { if (filteredDeviceData["enrolmentInfo"]["status"]== "ACTIVE") {
viewModel.isActive = true ; viewModel.isActive = true ;
} }
if (filteredDeviceData["enrolmentInfo"]["status"]== "REMOVED") {
viewModel.isNotRemoved = false ;
}
} }
if (filteredDeviceData["enrolmentInfo"]["owner"]) { if (filteredDeviceData["enrolmentInfo"]["owner"]) {
viewModel["owner"] = filteredDeviceData["enrolmentInfo"]["owner"]; viewModel["owner"] = filteredDeviceData["enrolmentInfo"]["owner"];

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

@ -87,6 +87,9 @@
<br class="c-both"/> <br class="c-both"/>
</div> </div>
</div> </div>
</div>
</div>
<div>
<div class="wr-input-control wr-btn-grp"> <div class="wr-input-control wr-btn-grp">
<a href="#" class="wr-btn wizard-stepper" data-is-back-btn="true" <a href="#" class="wr-btn wizard-stepper" data-is-back-btn="true"
data-current="policy-naming" data-next="policy-criteria"> data-current="policy-naming" data-next="policy-criteria">
@ -100,7 +103,6 @@
data-next="policy-message" data-validate="true"> data-next="policy-message" data-validate="true">
Save Save
</a> </a>
</div> </div>
</div> </div>
</div> </div>

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

@ -78,7 +78,7 @@
{{#zone "navbarCollapsableRightItems"}} {{#zone "navbarCollapsableRightItems"}}
<ul id="notification-bubble-wrapper" class="nav navbar-nav navbar-right"> <ul id="notification-bubble-wrapper" class="nav navbar-nav navbar-right">
<li class="visible-inline-block"> <li>
<!--<a href="{{@app.context}}notification-listing" title="Failures of operations on the device side will be listed here">--> <!--<a href="{{@app.context}}notification-listing" title="Failures of operations on the device side will be listed here">-->
<a data-toggle="sidebar" data-target="#right-sidebar" data-container=".page-content" <a data-toggle="sidebar" data-target="#right-sidebar" data-container=".page-content"
aria-expanded="false" rel="notifications-sidebar"> aria-expanded="false" rel="notifications-sidebar">