From 825f1a985d05f7b846a4681df8661da23e6ae9c5 Mon Sep 17 00:00:00 2001
From: Saad Sahibjan <saadsahibjan@gmail.com>
Date: Tue, 12 Mar 2019 22:02:26 +0530
Subject: [PATCH] Allow webclips installation via enrollment app install policy

---
 .../public/js/operation-mod.js                           | 3 ++-
 .../public/templates/android-policy-edit.hbs             | 7 ++++++-
 .../public/templates/android-policy-view.hbs             | 1 +
 .../public/templates/android-policy-operations.hbs       | 9 +++++++--
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/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 b/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
index 4a4cff3e94..dd11dcaeb6 100644
--- a/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
+++ b/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
@@ -784,7 +784,8 @@ var androidOperationModule = function () {
                                     $('[data-add-form-container="#enrollment-app-install-grid"]').empty();
                                     for (i=0; i<value.length; i++) {
                                         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>';
                                         $('[data-add-form-container="#enrollment-app-install-grid"]').append(content);
                                     }
diff --git a/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 b/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
index b6f6ddff07..b1016204df 100644
--- a/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
+++ b/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
@@ -2024,11 +2024,12 @@
 
                     <div id="install-app-enrollment"
                          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">
                             <thead>
                             <tr class="sort-row">
                                 <th>Application Name</th>
+                                <th>Type</th>
                                 <th>Version</th>
                                 <th></th>
                             </tr>
@@ -2040,6 +2041,10 @@
                                         {{this.appName}}
                                         <input class="enrollment-app-install-input" type="hidden" data-child-key="appName" value="{{this.appName}}"/>
                                     </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">
                                         {{this.version}}
                                         <input class="enrollment-app-install-input" type="hidden" data-child-key="version" value="{{this.version}}"/>
diff --git a/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 b/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
index a466bec155..c28539a233 100644
--- a/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
+++ b/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
@@ -2131,6 +2131,7 @@
                             <thead>
                             <tr class="sort-row">
                                 <th>Application Name</th>
+                                <th>Type</th>
                                 <th>Version</th>
                             </tr>
                             </thead>
diff --git a/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 b/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
index 0d9f3e6470..6f5fce10d6 100644
--- a/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
+++ b/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
@@ -2045,11 +2045,12 @@
 
                     <div id="install-app-enrollment"
                          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">
                             <thead>
                                 <tr class="sort-row">
                                     <th>Application Name</th>
+                                    <th>Type</th>
                                     <th>Version</th>
                                     <th></th>
                                 </tr>
@@ -2061,7 +2062,11 @@
                                         {{this.appName}}
                                         <input class="enrollment-app-install-input" type="hidden" data-child-key="appName" value="{{this.appName}}"/>
                                     </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}}
                                         <input class="enrollment-app-install-input" type="hidden" data-child-key="version" value="{{this.version}}"/>
                                     </td>