From 9ee5056967df948851782d64c1515788866e518a Mon Sep 17 00:00:00 2001
From: Menaka Jayawardena <menaka@wso2.com>
Date: Tue, 29 Aug 2017 14:52:57 +0530
Subject: [PATCH] Redirect to Permission listing after creating permission.

---
 .../cdmf.unit.role.edit.permission/permission.hbs   | 13 +------------
 .../public/js/bottomJs.js                           |  2 ++
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit.permission/permission.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit.permission/permission.hbs
index 8671888233a..30317ac0520 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit.permission/permission.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit.permission/permission.hbs
@@ -69,19 +69,8 @@
         <div id="role-created-msg" class="container col-centered wr-content hidden">
             <div class="wr-form">
                 <p class="page-sub-title">Permissions were assigned to the role successfully.</p>
-                <br>Please click <b>"Add Another Role"</b>, if you wish to add another role or click
-                <b>"View Role List"</b> to complete the process and go back to the role list.
+                <br>You will be redirected to Roles Listing Page in a moment.
                 <hr />
-                <button class="wr-btn" onclick="window.location.href='{{@app.context}}/roles'">
-                    View Role List
-                </button>
-                <a href="{{@app.context}}/role/add" 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>
-                    Add Another Role
-                </a>
             </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.permission/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.permission/public/js/bottomJs.js
index 315ab20d22d..0775eec6a15 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit.permission/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.permission/public/js/bottomJs.js
@@ -184,6 +184,8 @@ $(document).ready(function () {
                     // Refreshing with success message
                     $("#role-create-form").addClass("hidden");
                     $("#role-created-msg").removeClass("hidden");
+                    setTimeout(function(){}, 1000);
+                    window.location.href = "/devicemgt/roles";
                 }
             }, function (data) {
                 var payload = JSON.parse(data.responseText);