From 54b616985e53089c805e82962e42637f440dd6e6 Mon Sep 17 00:00:00 2001
From: Menaka Jayawardena <menaka@wso2.com>
Date: Thu, 31 Aug 2017 19:23:34 +0530
Subject: [PATCH] Added check for updating admin user by typing the url + code
 formatting.

---
 .../app/units/cdmf.unit.role.edit/edit.hbs    | 128 ++++++++++--------
 .../app/units/cdmf.unit.role.edit/edit.js     |   3 +
 2 files changed, 73 insertions(+), 58 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit/edit.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit/edit.hbs
index 76fc116776..428f1b8414 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit/edit.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit/edit.hbs
@@ -19,68 +19,80 @@
 <div class="row">
     <div class="col-md-12">
         <!-- content -->
-        <div id="role-create-form" data-cloud={{isCloud}} class="container col-centered wr-content">
-            <div class="wr-form">
-                <p class="page-sub-title">Edit Role</p>
-                <p>Please note that * sign represents required fields of data.</p>
-                <hr/>
-                <div class="row">
-                    <div class="col-lg-8">
-                        <div id="role-create-error-msg" class="alert alert-danger hidden" role="alert">
-                            <i class="icon fw fw-error"></i><span></span>
-                        </div>
-                        <label class="wr-input-label">Domain</label>
-                        <div class="wr-input-control">
-                            <select id="domain" class="form-control select" disabled>
-                                <option>{{userStore}}</option>
-                            </select>
-                        </div>
-                        <label class="wr-input-label">
-                            Role Name *
-                        </label>
-                        <br>
-                        <label class="wr-input-label" id="roleNameValidationText">
-                            ( {{roleNameHelpText}} )
-                        </label>
-                        {{#if isCloud}}
-                        <div id="roleNameField" class="form-group wr-input-control input-group">
-                            <!--suppress HtmlFormInputWithoutLabel -->
-                            <span class="input-group-addon" id="basic-addon1">devicemgt</span>
-                            <input aria-describedby="basic-addon1" type="text" id="rolename"
-                                   data-regex="{{roleNameJSRegEx}}"
-                                   data-errormsg="{{roleNameRegExViolationErrorMsg}}" class="form-control"
-                                   data-currentrole="{{role.roleName}}"
-                                   value="{{role.roleName}}"/>
-
-                        {{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}}"/>
-                        {{/if}}
+        {{#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>
+                    <hr/>
+                    <div class="row">
+                        <div class="col-lg-8">
+                            <div id="role-create-error-msg" class="alert alert-danger hidden" role="alert">
+                                <i class="icon fw fw-error"></i><span></span>
+                            </div>
+                            <label class="wr-input-label">Domain</label>
+                            <div class="wr-input-control">
+                                <select id="domain" class="form-control select" disabled>
+                                    <option>{{userStore}}</option>
+                                </select>
+                            </div>
+                            <label class="wr-input-label">
+                                Role Name *
+                            </label>
+                            <br>
+                            <label class="wr-input-label" id="roleNameValidationText">
+                                ( {{roleNameHelpText}} )
+                            </label>
+                            {{#if isCloud}}
+                                <div id="roleNameField" class="form-group wr-input-control input-group">
+                                    <!--suppress HtmlFormInputWithoutLabel -->
+                                    <span class="input-group-addon" id="basic-addon1">devicemgt</span>
+                                    <input aria-describedby="basic-addon1" type="text" id="rolename"
+                                           data-regex="{{roleNameJSRegEx}}"
+                                           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>
+                                                                                    minimum 3 characters long and do not
+                                                                                    include any whitespaces. </label>
+
+                            <br>
+                            <button id="add-role-btn" class="wr-btn">Update Role</button>
+
+                            <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>
+                                    <br>You will be redirected to Roles Listing Page in a moment.
+                                </div>
+                            </div>
+                            <!-- /content -->
+                            <div id="app-context" data-app-context="{{@app.context}}" class="hidden"></div>
                         </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>
-                    <br>You will be redirected to Roles Listing Page in a moment.
                 </div>
             </div>
-            <!-- /content -->
-            <div id="app-context" data-app-context="{{@app.context}}" class="hidden"></div>
-        </div>
+        {{/if}}
     </div>
-    <!-- /content/body -->
-    {{#zone "bottomJs"}}
-        {{js "js/bottomJs.js"}}
-    {{/zone}}
+</div>
+<!-- /content/body -->
+{{#zone "bottomJs"}}
+    {{js "js/bottomJs.js"}}
+{{/zone}}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit/edit.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit/edit.js
index d5c363ef1f..86ff656737 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit/edit.js
+++ b/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"];