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 #657 from rasika/master

Browse Source 
Fixing Android policy view and policy edit doesn't honor isCloud enabled param
This commit is contained in:
Kamidu Sachith Punchihewa 2017-04-28 07:58:30 +05:30 committed by GitHub
commit 6759a99ae9
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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.policy-edit/public/templates/android-policy-edit.hbs
View File

@ -65,6 +65,7 @@
<span id="vpn-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span> <span id="vpn-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
<span id="vpn-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span> <span id="vpn-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
</a> </a>
{{#unless iscloud}}
<a href="javascript:void(0)" onclick="showAdvanceOperation('work-profile', this)"> <a href="javascript:void(0)" onclick="showAdvanceOperation('work-profile', this)">
<span class="wr-hidden-operations-icon fw-stack"> <span class="wr-hidden-operations-icon fw-stack">
<i class="fw fw-service fw-stack-2x"></i> <i class="fw fw-service fw-stack-2x"></i>
@ -107,6 +108,7 @@
<span id="cosu-whitelisted-applications-error" class="has-error status-icon hidden"><i <span id="cosu-whitelisted-applications-error" class="has-error status-icon hidden"><i
class="fw fw-error"></i></span> class="fw fw-error"></i></span>
</a> </a>
{{/unless}}
</div> </div>
<div class="wr-hidden-operations-content col-lg-8"> <div class="wr-hidden-operations-content col-lg-8">
@ -302,6 +304,7 @@
</span> </span>
</label> </label>
</div> </div>
{{#unless iscloud}}
<div> <div>
<ul class="message message-info"> <ul class="message message-info">
<i class="icon fw fw-info"></i> <i class="icon fw fw-info"></i>
@ -696,6 +699,7 @@
</label> </label>
</div> </div>
<br> <br>
{{/unless}}
</div> </div>
</div> </div>
</div> </div>

4
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.policy-view/public/templates/android-policy-view.hbs
View File

@ -48,6 +48,7 @@
<span id="wifi-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span> <span id="wifi-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
<span id="wifi-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span> <span id="wifi-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
</a> </a>
{{#unless iscloud}}
<a href="javascript:void(0)" onclick="showAdvanceOperation('work-profile', this)"> <a href="javascript:void(0)" onclick="showAdvanceOperation('work-profile', this)">
<span class="wr-hidden-operations-icon fw-stack"> <span class="wr-hidden-operations-icon fw-stack">
<i class="fw fw-service fw-stack-2x"></i> <i class="fw fw-service fw-stack-2x"></i>
@ -90,6 +91,7 @@
<span id="cosu-whitelisted-applications-error" class="has-error status-icon hidden"><i <span id="cosu-whitelisted-applications-error" class="has-error status-icon hidden"><i
class="fw fw-error"></i></span> class="fw fw-error"></i></span>
</a> </a>
{{/unless}}
</div> </div>
<div class="wr-hidden-operations-content col-lg-8"> <div class="wr-hidden-operations-content col-lg-8">
<!-- passcode-policy --> <!-- passcode-policy -->
@ -287,6 +289,7 @@
</span> </span>
</label> </label>
</div> </div>
{{#unless iscloud}}
<br><b> <br><b>
Bellow restrictions will be applied on devices with Android version 5.0 Lollipop onwards only Bellow restrictions will be applied on devices with Android version 5.0 Lollipop onwards only
</b> </b>
@ -701,6 +704,7 @@
</label> </label>
</div> </div>
<br> <br>
{{/unless}}
</div> </div>
</div> </div>
</div> </div>