Merge pull request #937 from menakaj/master

Disabled edit button of admin role in role listing page.

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js

@@ -150,6 +150,8 @@ function loadRoles() {
 
                 var innerhtml = '';
 
+                var isAdminRole = $("#role-table").data("role") === data.name;
+
                 var editLink = '<a onclick="javascript:loadRoleBasedActionURL(\'edit\', \'' + data.name + '\')" ' +
                     'data-role="' + data.name + '" ' +
                     'data-click-event="edit-form" ' +
@@ -196,7 +198,7 @@ function loadRoles() {
                     '<span class="hidden-xs hidden-on-grid-view">Remove</span>' +
                     '</a>';
 
-                if (!isCloud) {
+                if (!isCloud && !isAdminRole) {
                     innerhtml = editLink + editPermissionLink + removeLink;
                 }
                 return innerhtml;

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.view/view.js

@@ -18,8 +18,6 @@
 
 function onRequest(context) {
     var userModule = require("/app/modules/business-controllers/user.js")["userModule"];
-    var username = request.getParameter("username");
-    var user = userModule.getUser(username)["content"];
     var deviceMgtProps = require("/app/modules/conf-reader/main.js")["conf"];
     var isExsistingUser = false;
     var userName = request.getParameter("username");
@@ -49,7 +47,8 @@ function onRequest(context) {
     }
 
     var canEdit = false;
-    if (userModule.isAuthorized("/permission/admin/device-mgt/users/edit")) {
+    if (userModule.isAuthorized("/permission/admin/device-mgt/users/edit") &&
+        userName !== deviceMgtProps['adminUser'].split("@")[0]) {
         canEdit = true;
     }
 

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit/edit.hbs

@@ -19,7 +19,16 @@
 <div class="row">
     <div class="col-md-12">
         <!-- content -->
-        <div id="role-create-form" data-cloud={{isCloud}} class="container col-centered wr-content">
+        {{#if isAdminRole}}
+            <div class="container col-centered wr-content">
+                <div class="wr-form">
+                    <p class="page-sub-title">Attention!</p>
+                    <hr/>
+                    <br>This is an prohibited action.
+                </div>
+            </div>
+        {{else}}
+            <div id="role-create-form" data-cloud={{isCloud}} class="container">
                 <div class="wr-form">
                     <p class="page-sub-title">Edit Role</p>
                     <p>Please note that * sign represents required fields of data.</p>
@@ -51,25 +60,23 @@
                                            data-errormsg="{{roleNameRegExViolationErrorMsg}}" class="form-control"
                                            data-currentrole="{{role.roleName}}"
                                            value="{{role.roleName}}"/>
-
+                                </div>
                             {{else}}
                                 <div id="roleNameField" class="form-group wr-input-control">
                                     <input type="text" id="rolename" data-regex="{{roleNameJSRegEx}}"
                                            data-errormsg="{{roleNameRegExViolationErrorMsg}}" class="form-control"
                                            data-currentrole="{{role.roleName}}"
                                            value="{{role.roleName}}"/>
+                                </div>
                             {{/if}}
                             <span class=" rolenameError hidden glyphicon glyphicon-remove form-control-feedback"></span>
                             <label class="error rolenameEmpty hidden" for="summary">Role name is required & Should be in
                                                                                     minimum 3 characters long and do not
                                                                                     include any whitespaces. </label>
-                        </div>
-                    </div>
-                    </div>
+
                             <br>
                             <button id="add-role-btn" class="wr-btn">Update Role</button>
-                </div>
-            </div>
+
                             <div id="role-created-msg" class="container col-centered wr-content hidden">
                                 <div class="wr-form">
                                     <p class="page-sub-title">Role was updated successfully.</p>
@@ -80,7 +87,12 @@
                             <div id="app-context" data-app-context="{{@app.context}}" class="hidden"></div>
                         </div>
                     </div>
-    <!-- /content/body -->
-    {{#zone "bottomJs"}}
+                </div>
+            </div>
+        {{/if}}
+    </div>
+</div>
+<!-- /content/body -->
+{{#zone "bottomJs"}}
     {{js "js/bottomJs.js"}}
-    {{/zone}}
+{{/zone}}

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit/edit.js

@@ -31,6 +31,8 @@ function onRequest(context) {
     var userStore;
     context.isCloud = deviceMgtProps.isCloud;
 
+    var isAdminRole = deviceMgtProps["adminRole"] === roleName;
+
     if (roleName) {
         if (roleName.indexOf("/") > -1) {
             userStore = roleName.substr(0, roleName.indexOf("/"));
@@ -41,6 +43,7 @@ function onRequest(context) {
         if (response["status"] == "success") {
             context["role"] = response["content"];
         }
+        context["isAdminRole"] = isAdminRole;
         context["userStore"] = userStore;
         context["roleNameJSRegEx"] = deviceMgtProps["roleValidationConfig"]["roleNameJSRegEx"];
         context["roleNameHelpText"] = deviceMgtProps["roleValidationConfig"]["roleNameHelpMsg"];