From 43b1a9f2787a240dd51001b33b413df259270d12 Mon Sep 17 00:00:00 2001
From: kamidu <sachithp@wso2.com>
Date: Wed, 12 Oct 2016 16:09:28 +0530
Subject: [PATCH] Fix for EMM-1651

---
 .../cdmf.page.users/public/js/listing.js      | 34 +++++++------------
 .../app/pages/cdmf.page.users/users.hbs       |  2 +-
 .../app/pages/cdmf.page.users/users.js        |  3 +-
 3 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js
index 43d6de1a83d..1074b271cf2 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js
@@ -313,7 +313,7 @@ function loadUsers() {
                 if (!data.firstname && !data.lastname) {
                     return "";
                 } else if (data.firstname && data.lastname) {
-                    return "<h4>&nbsp;&nbsp;" + data.firstname + " " + data.lastname + "</h4>";
+                    return "<h4>" + data.firstname + " " + data.lastname + "</h4>";
                 }
             }
         },
@@ -321,7 +321,7 @@ function loadUsers() {
             class: "fade-edge remove-padding-top",
             data: 'filter',
             render: function (filter, type, row, meta) {
-                return '&nbsp;&nbsp;<i class="fw-user"></i>&nbsp;&nbsp;' + filter;
+                return '<i class="fw-user"></i>' + filter;
             }
         },
         {
@@ -331,7 +331,7 @@ function loadUsers() {
                 if (!data.emailAddress) {
                     return "";
                 } else {
-                    return "&nbsp;&nbsp;<a href='mailto:" + data.emailAddress + "' ><i class='fw-mail'></i>&nbsp;&nbsp;" + data.emailAddress + "</a>";
+                    return "<a href='mailto:" + data.emailAddress + "' ><i class='fw-mail'></i>" + data.emailAddress + "</a>";
                 }
             }
         },
@@ -339,17 +339,13 @@ function loadUsers() {
             class: "text-right content-fill text-left-on-grid-view no-wrap",
             data: null,
             render: function (data, type, row, meta) {
-                var editbtn = '&nbsp;<a data-toggle="tooltip" data-placement="bottom" title="Edit User"href="' + context + '/user/edit?username=' + data.filter + '" data-username="' + data.filter + '" ' +
+                var editbtn = '<a data-toggle="tooltip" data-placement="bottom" title="Edit User"href="' + context + '/user/edit?username=' + data.filter + '" data-username="' + data.filter + '" ' +
                     'data-click-event="edit-form" ' +
                     'class="btn padding-reduce-on-grid-view edit-user-link"> ' +
                     '<span class="fw-stack"> ' +
                     '<i class="fw fw-ring fw-stack-2x"></i>' +
                     '<i class="fw fw-edit fw-stack-1x"></i>' +
-                    '</span>' +
-                    '<span class="hidden-xs hidden-on-grid-view">' +
-                    '&nbsp;&nbsp;Edit' +
-                    '</span>' +
-                    '</a>';
+                    '</span><span class="hidden-xs hidden-on-grid-view">Edit</span></a>';
 
                 var resetPasswordbtn = '<a data-toggle="tooltip" data-placement="bottom" title="Reset Password" href="#" data-username="' + data.filter + '" data-userid="' + data.filter + '" ' +
                     'data-click-event="edit-form" ' +
@@ -358,11 +354,7 @@ function loadUsers() {
                     '<span class="fw-stack">' +
                     '<i class="fw fw-ring fw-stack-2x"></i>' +
                     '<i class="fw fw-key fw-stack-1x"></i>' +
-                    '</span>' +
-                    '<span class="hidden-xs hidden-on-grid-view">' +
-                    '&nbsp;&nbsp;Reset Password' +
-                    '</span>' +
-                    '</a>';
+                    '</span><span class="hidden-xs hidden-on-grid-view">Reset Password</span></a>';
 
                 var removebtn = '<a data-toggle="tooltip" data-placement="bottom" title="Remove User" href="#" data-username="' + data.filter + '" data-userid="' + data.filter + '" ' +
                     'data-click-event="remove-form" ' +
@@ -371,20 +363,18 @@ function loadUsers() {
                     '<span class="fw-stack">' +
                     '<i class="fw fw-ring fw-stack-2x"></i>' +
                     '<i class="fw fw-delete fw-stack-1x"></i>' +
-                    '</span>' +
-                    '<span class="hidden-xs hidden-on-grid-view">' +
-                    '&nbsp;&nbsp;Remove' +
-                    '</span>' +
-                    '</a>';
+                    '</span><span class="hidden-xs hidden-on-grid-view">Remove</span></a>';
 
                 var returnbtnSet = '';
-                if ($("#can-edit").length > 0) {
+                var adminUser = $("#user-table").data("user");
+                var currentUser = $("#user-table").data("logged-user");
+                if ($("#can-edit").length > 0 && adminUser !== data.filter) {
                     returnbtnSet = returnbtnSet + editbtn;
                 }
-                if ($("#can-reset-password").length > 0) {
+                if ($("#can-reset-password").length > 0 && adminUser !== data.filter) {
                     returnbtnSet = returnbtnSet + resetPasswordbtn;
                 }
-                if ($("#can-remove").length > 0) {
+                if ($("#can-remove").length > 0 && adminUser !== data.filter && currentUser !== data.filter) {
                     returnbtnSet = returnbtnSet + removebtn;
                 }
 
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/users.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/users.hbs
index fe56dedb3c3..ea30ecbfc9f 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/users.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/users.hbs
@@ -65,7 +65,7 @@
         <br>
     </div>
 
-    <div id="user-table" data-user={{adminUser}}>
+    <div id="user-table" data-user={{adminUser}} data-logged-user={{currentUser}}>
         <table class="table table-striped table-hover list-table display responsive nowrap data-table grid-view"
                id="user-grid">
             <thead>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/users.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/users.js
index e4ef55ed1f0..e777b314ac4 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/users.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/users.js
@@ -31,7 +31,8 @@ function onRequest(context) {
     var userModule = require("/app/modules/business-controllers/user.js")["userModule"];
     var deviceMgtProps = require("/app/modules/conf-reader/main.js")["conf"];
 
-    page["adminUser"] = deviceMgtProps["adminUser"];
+    page["currentUser"] = userModule.getCarbonUser().username;
+    page["adminUser"] = deviceMgtProps["adminUser"].split("@")[0];
 
     if (userModule.isAuthorized("/permission/admin/device-mgt/users/manage")) {
         page.canManage = true;