From 0ab9db2afdf39ea6b443a3beb9799a22beed3f58 Mon Sep 17 00:00:00 2001 From: kamidu Date: Mon, 26 Sep 2016 18:05:29 +0530 Subject: [PATCH] Fix for EMM-1575 --- .../pages/cdmf.page.user.create/create.hbs | 10 +- .../public/js/bottomJs.js | 50 +++-- .../app/pages/cdmf.page.user.edit/edit.hbs | 198 +++++++++--------- .../app/pages/cdmf.page.user.edit/edit.js | 5 +- .../cdmf.page.user.edit/public/js/bottomJs.js | 44 ++-- 5 files changed, 165 insertions(+), 142 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.create/create.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.create/create.hbs index 9867540a55..b0088ff964 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.create/create.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.create/create.hbs @@ -103,12 +103,12 @@ - {{#if canViewRoles}} +
- - -
- -
- -
- -
- - - -
- -
- - - -
- -
- - - - -
- -
- + {{#if canManage}} + +
+
+ +
+
+

Edit User

+

Please note that * sign represents required fields of data.

+
+
+
+ + +
+ +
+ +
+ +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + + +
+ {{#if canViewRoles}} + +
+ +
+ {{/if}}
+
+
-
-
-
- -
- -{{else}} -

- Permission Denied -

-
- You not authorized to enter User Management Section. -
-{{/if}} + + {{else}} +

+ Permission Denied +

+
+ You not authorized to enter User Management Section. +
+ {{/if}} {{/zone}} diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.edit/edit.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.edit/edit.js index 95d5b41059..38b824c9f0 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.edit/edit.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.edit/edit.js @@ -22,7 +22,7 @@ function onRequest() { var userName = request.getParameter("username"); var user = userModule.getUser(userName)["content"]; - + if (user) { var title; if (user.firstname && user.lastname) { @@ -63,6 +63,9 @@ function onRequest() { if (userModule.isAuthorized("/permission/admin/device-mgt/users/manage")) { page.canManage = true; } + if (userModule.isAuthorized("/permission/admin/device-mgt/roles/view")) { + page.canViewRoles = true; + } page["usernameJSRegEx"] = devicemgtProps["userValidationConfig"]["usernameJSRegEx"]; page["usernameRegExViolationErrorMsg"] = devicemgtProps["userValidationConfig"]["usernameRegExViolationErrorMsg"]; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.edit/public/js/bottomJs.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.edit/public/js/bottomJs.js index 13192b0cda..295195e3f7 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.edit/public/js/bottomJs.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.edit/public/js/bottomJs.js @@ -75,7 +75,7 @@ var disableInlineError = function (inputField, errorMsg, errorSign) { */ validateInline["user-name"] = function () { var usernameinput = $("input#username"); - if (inputIsValid( usernameinput.data("regex"), usernameinput.val())) { + if (inputIsValid(usernameinput.data("regex"), usernameinput.val())) { disableInlineError("usernameInputField", "usernameEmpty", "usernameError"); } else { enableInlineError("usernameInputField", "usernameEmpty", "usernameError"); @@ -113,12 +113,12 @@ validateInline["last-name"] = function () { validateInline["emailAddress"] = function () { var email = $("#emailAddress").val(); if (!email) { - enableInlineError("emailField", "email-required" , "emailError"); + enableInlineError("emailField", "email-required", "emailError"); } else if (emailIsValid(email)) { - disableInlineError("emailField", "email-required" , "emailError"); - disableInlineError("emailField", "email-invalid" , "emailError"); + disableInlineError("emailField", "email-required", "emailError"); + disableInlineError("emailField", "email-invalid", "emailError"); } else { - enableInlineError("emailField", "email-invalid" , "emailError"); + enableInlineError("emailField", "email-invalid", "emailError"); } }; @@ -148,8 +148,8 @@ clearInline["last-name"] = function () { * clear Validation messages when gain focus to the field. */ clearInline["emailAddress"] = function () { - disableInlineError("emailField", "email-required" , "emailError"); - disableInlineError("emailField", "email-invalid" , "emailError"); + disableInlineError("emailField", "email-required", "emailError"); + disableInlineError("emailField", "email-invalid", "emailError"); }; /** @@ -168,11 +168,16 @@ $(document).ready(function () { $("select.select2[multiple=multiple]").select2({ tags: false }); - var roleList = $("#roles").attr("selectedVals").trim().replace(/ /g, ""); - roleList = roleList.replace(/(\r\n|\n|\r)/gm, ""); - var roleArr = roleList.split(","); - $("#roles").val(roleArr).trigger("change"); + var roleList, roleArr; + if ($("#roles").length > 0) { + roleList = $("#roles").attr("selectedVals").trim().replace(/ /g, ""); + roleList = roleList.replace(/(\r\n|\n|\r)/gm, ""); + roleArr = roleList.split(","); + } + if ($("#roles").length > 0) { + $("#roles").val(roleArr).trigger("change"); + } /** * Following click function would execute * when a user clicks on "Add User" button @@ -188,7 +193,10 @@ $(document).ready(function () { var firstname = firstnameInput.val(); var lastname = lastnameInput.val(); var emailAddress = $("input#emailAddress").val(); - var roles = $("select#roles").val(); + var roles; + if ($("#roles").length > 0) { + var roles = $("select#roles").val(); + } var errorMsgWrapper = "#user-create-error-msg"; var errorMsg = "#user-create-error-msg span"; if (!username) { @@ -255,27 +263,27 @@ $(document).ready(function () { } }); - $("#emailAddress").focus(function() { + $("#emailAddress").focus(function () { clearInline["emailAddress"](); }); - $("#emailAddress").blur(function() { + $("#emailAddress").blur(function () { validateInline["emailAddress"](); }); - $("#lastname").focus(function() { + $("#lastname").focus(function () { clearInline["last-name"](); }); - $("#lastname").blur(function() { + $("#lastname").blur(function () { validateInline["last-name"](); }); - $("#firstname").focus(function() { + $("#firstname").focus(function () { clearInline["first-name"](); }); - $("#firstname").blur(function() { + $("#firstname").blur(function () { validateInline["first-name"](); }); }); \ No newline at end of file