From 7911e0cce6e1047ff6c6302fd1936794df17df0f Mon Sep 17 00:00:00 2001 From: dilanua Date: Sun, 18 Sep 2016 08:51:05 +0530 Subject: [PATCH] Updating EMM dashboard - UI --- .../app/pages/mdm.page.dashboard/dashboard.js | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.js index adc0c3779a..da2c2b46d9 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.js +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.js @@ -16,24 +16,25 @@ * under the License. */ -function onRequest(context) { +function onRequest() { var userModule = require("/app/modules/business-controllers/user.js")["userModule"]; - var generalConfig = context.app.conf["generalConfig"]; var mdmProps = require("/app/modules/conf-reader/main.js")["conf"]; + var viewModel = {}; var permissions = {}; - permissions.LIST_DEVICES = userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/view"); - permissions.LIST_POLICIES = userModule.isAuthorized("/permission/admin/device-mgt/policies/view"); - permissions.LIST_ROLES = userModule.isAuthorized("/permission/admin/device-mgt/roles/view"); - permissions.LIST_USERS = userModule.isAuthorized("/permission/admin/device-mgt/users/view"); - permissions.ADD_POLICY = userModule.isAuthorized("/permission/admin/device-mgt/policies/manage"); - permissions.ADD_ROLE = userModule.isAuthorized("/permission/admin/device-mgt/roles/manage"); - permissions.ADD_USER = userModule.isAuthorized("/permission/admin/device-mgt/users/manage"); - if (userModule.isAuthorized("/permission/admin/device-mgt/devices/enroll/ios") | userModule.isAuthorized("/permission/admin/devices/enroll/android") | userModule.isAuthorized("/permission/admin/device-mgt/devices/enroll/windows") ){ - permissions.ENROLL_DEVICE = true; - } - viewModel.permissions = permissions; + permissions["LIST_DEVICES"] = userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/view"); + permissions["ENROLL_DEVICE"] = userModule.isAuthorized("/permission/admin/device-mgt/devices/enroll/ios") || + userModule.isAuthorized("/permission/admin/devices/enroll/android") || + userModule.isAuthorized("/permission/admin/device-mgt/devices/enroll/windows"); + permissions["LIST_POLICIES"] = userModule.isAuthorized("/permission/admin/device-mgt/policies/view"); + permissions["ADD_POLICY"] = userModule.isAuthorized("/permission/admin/device-mgt/policies/manage"); + permissions["LIST_USERS"] = userModule.isAuthorized("/permission/admin/device-mgt/users/view"); + permissions["ADD_USER"] = userModule.isAuthorized("/permission/admin/device-mgt/users/manage"); + permissions["LIST_ROLES"] = userModule.isAuthorized("/permission/admin/device-mgt/roles/view"); + permissions["ADD_ROLE"] = userModule.isAuthorized("/permission/admin/device-mgt/roles/manage"); + + viewModel["permissions"] = permissions; //TODO: Move enrollment URL into app-conf.json - viewModel.enrollmentURL = mdmProps.generalConfig.host + mdmProps.enrollmentDir; + viewModel["enrollmentURL"] = mdmProps["generalConfig"]["host"] + mdmProps["enrollmentDir"]; return viewModel; } \ No newline at end of file