rajitha
/
device-mgt-plugins
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 
Allow web clips installation via enrollment app install policy

Closes product-iots#61

See merge request entgra/carbon-device-mgt-plugins!21
revert-dabc3590
Dharmakeerthi Lasantha 6 years ago
parent 140fd9af71 825f1a985d
commit c03f069887
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File

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.operation-mod/public/js/operation-mod.js
Unescape View File

@ -784,7 +784,8 @@ var androidOperationModule = function () {
$('[data-add-form-container="#enrollment-app-install-grid"]').empty(); $('[data-add-form-container="#enrollment-app-install-grid"]').empty();
for (i=0; i<value.length; i++) { for (i=0; i<value.length; i++) {
var content = '<tr><td data-title="enrollment-app-install-app-name">' var content = '<tr><td data-title="enrollment-app-install-app-name">'
+ value[i].appName + '</td><td data-title="enrollment-app-install-version">' + value[i].appName + '</td><td data-title="enrollment-app-install-app-type">'
+ value[i].type + '</td><td data-title="enrollment-app-install-version">'
+ value[i].version + '</td></tr>'; + value[i].version + '</td></tr>';
$('[data-add-form-container="#enrollment-app-install-grid"]').append(content); $('[data-add-form-container="#enrollment-app-install-grid"]').append(content);
} }

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

@ -2024,11 +2024,12 @@
<div id="install-app-enrollment" <div id="install-app-enrollment"
class="operationDataKeys grouped-array-input multi-column-key-value-pair-array specific-enrollment-app-install" class="operationDataKeys grouped-array-input multi-column-key-value-pair-array specific-enrollment-app-install"
data-key="enrollmentAppInstall" data-column-count="4"> data-key="enrollmentAppInstall" data-column-count="5">
<table class="table table-responsive table-striped data-table" id="enrollment-app-install-table"> <table class="table table-responsive table-striped data-table" id="enrollment-app-install-table">
<thead> <thead>
<tr class="sort-row"> <tr class="sort-row">
<th>Application Name</th> <th>Application Name</th>
<th>Type</th>
<th>Version</th> <th>Version</th>
<th></th> <th></th>
</tr> </tr>
@ -2040,6 +2041,10 @@
{{this.appName}} {{this.appName}}
<input class="enrollment-app-install-input" type="hidden" data-child-key="appName" value="{{this.appName}}"/> <input class="enrollment-app-install-input" type="hidden" data-child-key="appName" value="{{this.appName}}"/>
</td> </td>
<td data-title="enrollment-app-install-app-type">
{{this.type}}
<input class="enrollment-app-install-input" type="hidden" data-child-key="type" value="{{this.type}}"/>
</td>
<td data-title="enrollment-app-install-app-name"> <td data-title="enrollment-app-install-app-name">
{{this.version}} {{this.version}}
<input class="enrollment-app-install-input" type="hidden" data-child-key="version" value="{{this.version}}"/> <input class="enrollment-app-install-input" type="hidden" data-child-key="version" value="{{this.version}}"/>

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

@ -2131,6 +2131,7 @@
<thead> <thead>
<tr class="sort-row"> <tr class="sort-row">
<th>Application Name</th> <th>Application Name</th>
<th>Type</th>
<th>Version</th> <th>Version</th>
</tr> </tr>
</thead> </thead>

9
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-wizard/public/templates/android-policy-operations.hbs
Unescape View File

@ -2045,11 +2045,12 @@
<div id="install-app-enrollment" <div id="install-app-enrollment"
class="operationDataKeys grouped-array-input multi-column-key-value-pair-array specific-enrollment-app-install" class="operationDataKeys grouped-array-input multi-column-key-value-pair-array specific-enrollment-app-install"
data-key="enrollmentAppInstall" data-column-count="4"> data-key="enrollmentAppInstall" data-column-count="5">
<table class="table table-responsive table-striped data-table" id="enrollment-app-install-table"> <table class="table table-responsive table-striped data-table" id="enrollment-app-install-table">
<thead> <thead>
<tr class="sort-row"> <tr class="sort-row">
<th>Application Name</th> <th>Application Name</th>
<th>Type</th>
<th>Version</th> <th>Version</th>
<th></th> <th></th>
</tr> </tr>
@ -2061,7 +2062,11 @@
{{this.appName}} {{this.appName}}
<input class="enrollment-app-install-input" type="hidden" data-child-key="appName" value="{{this.appName}}"/> <input class="enrollment-app-install-input" type="hidden" data-child-key="appName" value="{{this.appName}}"/>
</td> </td>
<td data-title="enrollment-app-install-app-name"> <td data-title="enrollment-app-install-app-type">
{{this.type}}
<input class="enrollment-app-install-input" type="hidden" data-child-key="type" value="{{this.type}}"/>
</td>
<td data-title="enrollment-app-install-app-version">
{{this.version}} {{this.version}}
<input class="enrollment-app-install-input" type="hidden" data-child-key="version" value="{{this.version}}"/> <input class="enrollment-app-install-input" type="hidden" data-child-key="version" value="{{this.version}}"/>
</td> </td>

Write Preview
Loading…
Cancel
Save