From e238cfd2f925d5c6ae7073c110f3ea3f241608a7 Mon Sep 17 00:00:00 2001
From: Menaka Jayawardena <menaka@wso2.com>
Date: Tue, 29 Aug 2017 15:12:27 +0530
Subject: [PATCH] Redirect to user listing after editing the user.

---
 .../app/pages/cdmf.page.user.edit/edit.hbs          | 13 +------------
 .../pages/cdmf.page.user.edit/public/js/bottomJs.js |  4 ++++
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.edit/edit.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.edit/edit.hbs
index 18f0c91235..41728ad0a8 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.edit/edit.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.edit/edit.hbs
@@ -123,18 +123,7 @@
                     <div class="wr-form">
                         <p class="page-sub-title">User was updated successfully.</p>
 
-                        <br>Please click <b>"View Updated User"</b>, if you wish to view the updated user or click
-                        <b>"View User List"</b> to complete the process and go back to the user list.
-                        <hr/>
-                        <button class="wr-btn" onclick="window.location.href='{{@app.context}}/users'">View User List
-                        </button>
-                        <a href="{{@app.context}}/user/view?username={{editUser.username}}" class="cu-btn-inner">
-                        <span class="fw-stack">
-                            <i class="fw fw-circle-outline fw-stack-2x"></i>
-                            <i class="fw fw-view fw-stack-1x"></i>
-                        </span>
-                            View Updated User
-                        </a>
+                        <br>You will be redirected to User 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/pages/cdmf.page.user.edit/public/js/bottomJs.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.edit/public/js/bottomJs.js
index 2ecada94ad..c700b06199 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.edit/public/js/bottomJs.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.edit/public/js/bottomJs.js
@@ -248,6 +248,10 @@ $(document).ready(function () {
                         // Refreshing with success message
                         $("#user-create-form").addClass("hidden");
                         $("#user-created-msg").removeClass("hidden");
+                        setTimeout(function () {
+                            window.location.href = "/devicemgt/users"
+                        }, 1000);
+
                     }
                 }, function (jqXHR) {
                     var payload = JSON.parse(jqXHR.responseText);