From 80a08a274418201ae223fcc1a88fac80a6f3ba16 Mon Sep 17 00:00:00 2001
From: Menaka Jayawardena <menaka@wso2.com>
Date: Tue, 29 Aug 2017 15:17:02 +0530
Subject: [PATCH] Redirect to Group Listing page after creating a Group.

---
 .../app/pages/cdmf.page.group.create/create.hbs     | 13 +------------
 .../cdmf.page.group.create/public/js/group-add.js   |  3 +++
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/create.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/create.hbs
index 9e6ee54a711..62cea7955e9 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/create.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/create.hbs
@@ -73,18 +73,7 @@
             <div class="wr-form">
                 <p class="page-sub-title">Group was created successfully.</p>
 
-                <br>Please click <b>"Add Another Group"</b>, if you wish to add another group or click
-                <b>"View Group List"</b> to complete the process and go back to the group list.
-                <hr/>
-                <button class="wr-btn" onclick="window.location.href='{{@app.context}}/groups'">View Group List
-                </button>
-                <a href="{{@app.context}}/group/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 Group
-                </a>
+                <br>You will be redirected to the Group Listing page in a moment.
             </div>
         </div>
 
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/public/js/group-add.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/public/js/group-add.js
index 85b34decd95..59c27b321bc 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/public/js/group-add.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/public/js/group-add.js
@@ -47,6 +47,9 @@ $(function () {
                 if (resp.status == 201) {
                     $("#group-create-form").addClass("hidden");
                     $("#group-created-msg").removeClass("hidden");
+                    setTimeout(function(){
+                        window.location.href = "/devicemgt/groups";
+                    }, 1000);
                 } else {
                     displayErrors(resp.status);
                 }