From c754b64653963f279e7a44151322ea0512e9c3e7 Mon Sep 17 00:00:00 2001
From: Menaka Jayawardena <menaka@wso2.com>
Date: Tue, 29 Aug 2017 15:23:27 +0530
Subject: [PATCH] Redirect to Role Listing page after editing a Role.

---
 .../app/units/cdmf.unit.role.edit/edit.hbs        | 15 +--------------
 .../cdmf.unit.role.edit/public/js/bottomJs.js     |  3 +++
 2 files changed, 4 insertions(+), 14 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 979b5c1450..76fc116776 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
@@ -73,20 +73,7 @@
             <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>Please click <b>"View Updated Role"</b>, if you wish to view the updated role or click
-                    <b>"View Role List"</b> to complete the process and go back to the role list.
-                    <hr/>
-                    <button class="wr-btn" onclick="window.location.href='{{@app.context}}/roles'">
-                        View Role List
-                    </button>
-                    <a href="{{@app.context}}/roles/edit-role/{{role.roleName}}"
-                       class="cu-btn-inner">
-                        <span class="fw-stack">
-                            <i class="fw fw-circle-outline fw-stack-2x"></i>
-                            <i class="fw fw-add fw-stack-1x"></i>
-                        </span>
-                        View Updated Role
-                    </a>
+                    <br>You will be redirected to Roles Listing Page in a moment.
                 </div>
             </div>
             <!-- /content -->
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit/public/js/bottomJs.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit/public/js/bottomJs.js
index 6ae0e8016f..2d477591bd 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit/public/js/bottomJs.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit/public/js/bottomJs.js
@@ -210,6 +210,9 @@ $(document).ready(function () {
                         // Refreshing with success message
                         $("#role-create-form").addClass("hidden");
                         $("#role-created-msg").removeClass("hidden");
+                        setTimeout(function(){
+                            window.location.href = "/devicemgt/roles";
+                        }, 1000);
                     }
                 }, function (data) {