community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'enrollment-app-install-webclip' into 'master'

Browse Source 
Allow web clips installation via enrollment app install policy

Closes product-iots#61

See merge request entgra/carbon-device-mgt!46
This commit is contained in:
Dharmakeerthi Lasantha 2019-03-13 05:48:18 +00:00
commit c1d6462e7d
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/policy.js
View File

@ -223,7 +223,13 @@ policyModule = function () {
appObjectToView = {}; appObjectToView = {};
appObjectToView["appName"] = appObjectFromRestEndpoint["name"]; appObjectToView["appName"] = appObjectFromRestEndpoint["name"];
appObjectToView["appId"] = appObjectFromRestEndpoint["id"]; appObjectToView["appId"] = appObjectFromRestEndpoint["id"];
appObjectToView["packageName"] = appObjectFromRestEndpoint["appmeta"]["package"]; if ("webapp" === appObjectFromRestEndpoint["platform"]) {
appObjectToView["packageName"] = appObjectFromRestEndpoint["appmeta"]["weburl"];
appObjectToView["type"] = "Web Clip"
} else {
appObjectToView["packageName"] = appObjectFromRestEndpoint["appmeta"]["package"];
appObjectToView["type"] = "Mobile App"
}
appObjectToView["version"] = appObjectFromRestEndpoint["version"]; appObjectToView["version"] = appObjectFromRestEndpoint["version"];
appObjectToView["platform"] = appObjectFromRestEndpoint["platform"]; appObjectToView["platform"] = appObjectFromRestEndpoint["platform"];
storeApps.push(appObjectToView); storeApps.push(appObjectToView);

2
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.create/public/js/policy-create.js
View File

@ -202,7 +202,7 @@ function getStoreApps(storeApps, deviceType) {
var selectedApps = []; var selectedApps = [];
var i; var i;
for (i=0; i<storeApps.length; i++) { for (i=0; i<storeApps.length; i++) {
if (deviceType === storeApps[i].platform) { if (deviceType === storeApps[i].platform || "webapp" === storeApps[i].platform) {
selectedApps.push(storeApps[i]); selectedApps.push(storeApps[i]);
} }
} }

2
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/public/js/policy-edit.js
View File

@ -259,7 +259,7 @@ function getStoreApps(storeApps, deviceType) {
var selectedApps = []; var selectedApps = [];
var i; var i;
for (i=0; i<storeApps.length; i++) { for (i=0; i<storeApps.length; i++) {
if (storeApps[i].platform === deviceType) { if (storeApps[i].platform === deviceType || "webapp" === storeApps[i].platform) {
selectedApps.push(storeApps[i]); selectedApps.push(storeApps[i]);
} }
} }