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 branch 'kiosk-policy-ui' into 'master'

Browse Source 
Kiosk Policy UI - Tenant domain changes

See merge request entgra/carbon-device-mgt-plugins!25
This commit is contained in:
Saad Sahibjan 2019-03-29 09:21:02 +00:00
commit 59a4d9d034
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -509,6 +509,7 @@ var androidOperationModule = function () {
deviceGlobalConfigurations["displayOrientation"] = operationData["displayOrientation"]; deviceGlobalConfigurations["displayOrientation"] = operationData["displayOrientation"];
if (deviceGlobalConfigurations["isMultiUserDevice"] === true) { if (deviceGlobalConfigurations["isMultiUserDevice"] === true) {
deviceGlobalConfigurations["isLoginRequired"] = operationData["isLoginRequired"]; deviceGlobalConfigurations["isLoginRequired"] = operationData["isLoginRequired"];
deviceGlobalConfigurations["tenantDomainName"] = $("#logged-in-user").data("domain");
var storeApps = $("#cosu-profile-app-configs-storeapps").data("storeapps"); var storeApps = $("#cosu-profile-app-configs-storeapps").data("storeapps");
var primaryUserApps = { var primaryUserApps = {
"username" : "primaryUser", "username" : "primaryUser",
@ -522,7 +523,7 @@ var androidOperationModule = function () {
userAppConfigurations[index]["visibleAppList"].split(/,(?![^{]*})/) userAppConfigurations[index]["visibleAppList"].split(/,(?![^{]*})/)
.map(function (item) { .map(function (item) {
var packageName = item.trim(); var packageName = item.trim();
if (packageName) { if (packageName && storeApps) {
var i; var i;
for (i=0; i<storeApps.length; i++) { for (i=0; i<storeApps.length; i++) {
if (packageName === storeApps[i]["packageName"]) { if (packageName === storeApps[i]["packageName"]) {

2
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

@ -1779,7 +1779,7 @@
</label> </label>
</div> </div>
<div id="cosu-global-config-multi-user-enabled" <div id="cosu-global-config-multi-user-enabled"
class="panel-collapse panel-body collapse-config specific-cosu-global-config-multi-user-enabled" class="panel-collapse panel-body collapse-config"
role="tabpanel" style="display: none;"> role="tabpanel" style="display: none;">
<div class="wr-input-control"> <div class="wr-input-control">
<label class="wr-input-control checkbox"> <label class="wr-input-control checkbox">

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

@ -1509,7 +1509,9 @@
</label> </label>
</div> </div>
<div id="cosu-global-config-multi-user-enabled" <div id="cosu-global-config-multi-user-enabled"
class="panel-collapse panel-body collapse-config specific-cosu-global-config-multi-user-enabled" role="tabpanel" style="display: none;"> class="panel-collapse panel-body collapse-config"
role="tabpanel"
style="display: none;">
<div class="wr-input-control"> <div class="wr-input-control">
<label class="wr-input-control checkbox"> <label class="wr-input-control checkbox">
<input id="cosu-global-config-is-is-login-required" type="checkbox" <input id="cosu-global-config-is-is-login-required" type="checkbox"