From 91ab732dba19d87bc74860cfc7eca8953beb2120 Mon Sep 17 00:00:00 2001
From: charithag <charitha.ws@gmail.com>
Date: Fri, 7 Aug 2015 15:20:23 +0530
Subject: [PATCH] Set trigger to display add group popup

---
 .../iotserver/units/dashboard/dashboard.hbs   |  50 ++++-----
 .../group-listing/public/js/group-listing.js  | 100 ++++++++++--------
 2 files changed, 79 insertions(+), 71 deletions(-)

diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/dashboard/dashboard.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/units/dashboard/dashboard.hbs
index 5b2ed67a..5a353abd 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/dashboard/dashboard.hbs
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/dashboard/dashboard.hbs
@@ -30,62 +30,64 @@
                     </div>
                 </div>
             </div>
-            {{#if permissions.ADD_USER}}
+
             <div class="col-md-4">
                 <div class="wr-stats-board-tile">
-                    <div class="tile-name">Users</div>
+                    <div class="tile-name">Groups</div>
                     <div>
-                        <div class="tile-icon"><i class="fw fw-user"></i></div>
+                        <div class="tile-icon"><i class="fw fw-policy"></i></div>
                         <div class="tile-stats">
-                            <span id="user-count">Loading...</span>
+                            <span id="group-count">Loading...</span>
                             <span class="tile-stats-free">
-                                <a href="users/">
+                                <a href="groups">
                                     <span class="fw-stack">
                                         <i class="fw fw-ring fw-stack-2x"></i>
                                         <i class="fw fw-view fw-stack-1x"></i>
                                     </span>
                                     View
                                 </a>
-                                <!--<a href="user-create.html">-->
-                                    <!--<span class="fw-stack">-->
-                                        <!--<i class="fw fw-ring fw-stack-2x"></i>-->
-                                        <!--<i class="fw fw-add fw-stack-1x"></i>-->
-                                    <!--</span>-->
-                                    <!--Add-->
-                                <!--</a>-->
+                                <a href="groups/add-group">
+                                    <span class="fw-stack">
+                                        <i class="fw fw-ring fw-stack-2x"></i>
+                                        <i class="fw fw-add fw-stack-1x"></i>
+                                    </span>
+                                    Add
+                                </a>
                             </span>
                         </div>
                     </div>
                 </div>
             </div>
-            {{/if}}
+
+            {{#if permissions.ADD_USER}}
             <div class="col-md-4">
                 <div class="wr-stats-board-tile">
-                    <div class="tile-name">Groups</div>
+                    <div class="tile-name">Users</div>
                     <div>
-                        <div class="tile-icon"><i class="fw fw-policy"></i></div>
+                        <div class="tile-icon"><i class="fw fw-user"></i></div>
                         <div class="tile-stats">
-                            <span id="group-count">Loading...</span>
+                            <span id="user-count">Loading...</span>
                             <span class="tile-stats-free">
-                                <a href="groups">
+                                <a href="users/">
                                     <span class="fw-stack">
                                         <i class="fw fw-ring fw-stack-2x"></i>
                                         <i class="fw fw-view fw-stack-1x"></i>
                                     </span>
                                     View
                                 </a>
-                                <a href="groups/add-group">
-                                    <span class="fw-stack">
-                                        <i class="fw fw-ring fw-stack-2x"></i>
-                                        <i class="fw fw-add fw-stack-1x"></i>
-                                    </span>
-                                    Add
-                                </a>
+                                <!--<a href="user-create.html">-->
+                                    <!--<span class="fw-stack">-->
+                                        <!--<i class="fw fw-ring fw-stack-2x"></i>-->
+                                        <!--<i class="fw fw-add fw-stack-1x"></i>-->
+                                    <!--</span>-->
+                                    <!--Add-->
+                                <!--</a>-->
                             </span>
                         </div>
                     </div>
                 </div>
             </div>
+            {{/if}}
 
             <div class="col-md-4">
                 <div class="wr-stats-board-tile">
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/group-listing/public/js/group-listing.js b/modules/distribution/src/repository/jaggeryapps/iotserver/units/group-listing/public/js/group-listing.js
index cdfbd19d..24be4bce 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/group-listing/public/js/group-listing.js
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/group-listing/public/js/group-listing.js
@@ -64,7 +64,14 @@ $(document).ready(function () {
             return $("#content-filter-types").html();
         }
     });
+
+    loadGroups();
     changeGroupView('grid', $('a.ctrl-filter-grid'));
+
+    var path = window.location.pathname;
+    if (path == '/iotserver/groups/add-group'){
+        addNewGroup();
+    }
 });
 
 /*
@@ -168,9 +175,6 @@ function loadGroups(searchType, searchParam) {
             });
     });
 }
-$(document).ready(function () {
-    loadGroups();
-});
 
 function formatDates() {
     $(".formatDate").each(function () {
@@ -236,58 +240,60 @@ function attachGroupAdding() {
      * when a user clicks on "Remove" link
      * on Group Management page in WSO2 IoT Server Console.
      */
-    $("a.add-group-link").click(function () {
-        var addGroupApi = "/iotserver/api/group/add";
-        $(modalPopupContent).html($('#add-group-modal-content').html());
-        showPopup();
+    $("a.add-group-link").click(addNewGroup);
+}
 
-        $("a#add-group-yes-link").click(function () {
-            var newGroupName = $('#add-group-name').val();
-            var newGroupDescription = $('#add-group-description').val();
-            var group = {"name": newGroupName, "description": newGroupDescription};
-            invokerUtil.post(
-                addGroupApi,
-                group,
-                function (data, txtStatus, jqxhr) {
-                    var status = jqxhr.status;
-                    if (status == 200) {
-                        if (data != "false") {
-                            $(modalPopupContent).html($('#add-group-200-content').html());
-                            loadGroups();
-                            setTimeout(function () {
-                                hidePopup();
-                            }, 2000);
-                        } else {
-                            $(modalPopupContent).html($('#group-400-content').html());
-                            $("a#group-400-link").click(function () {
-                                hidePopup();
-                            });
-                        }
-                    } else if (status == 400) {
+var addNewGroup = function () {
+    var addGroupApi = "/iotserver/api/group/add";
+    $(modalPopupContent).html($('#add-group-modal-content').html());
+    showPopup();
+
+    $("a#add-group-yes-link").click(function () {
+        var newGroupName = $('#add-group-name').val();
+        var newGroupDescription = $('#add-group-description').val();
+        var group = {"name": newGroupName, "description": newGroupDescription};
+        invokerUtil.post(
+            addGroupApi,
+            group,
+            function (data, txtStatus, jqxhr) {
+                var status = jqxhr.status;
+                if (status == 200) {
+                    if (data != "false") {
+                        $(modalPopupContent).html($('#add-group-200-content').html());
+                        loadGroups();
+                        setTimeout(function () {
+                            hidePopup();
+                        }, 2000);
+                    } else {
                         $(modalPopupContent).html($('#group-400-content').html());
                         $("a#group-400-link").click(function () {
                             hidePopup();
                         });
-                    } else if (status == 403) {
-                        $(modalPopupContent).html($('#agroup-403-content').html());
-                        $("a#group-403-link").click(function () {
-                            hidePopup();
-                        });
-                    } else if (status == 409) {
-                        $(modalPopupContent).html($('#group-409-content').html());
-                        $("a#group-409-link").click(function () {
-                            hidePopup();
-                        });
                     }
-                }, errorHandler
-            );
-        });
-
-        $("a#add-group-cancel-link").click(function () {
-            hidePopup();
-        });
+                } else if (status == 400) {
+                    $(modalPopupContent).html($('#group-400-content').html());
+                    $("a#group-400-link").click(function () {
+                        hidePopup();
+                    });
+                } else if (status == 403) {
+                    $(modalPopupContent).html($('#agroup-403-content').html());
+                    $("a#group-403-link").click(function () {
+                        hidePopup();
+                    });
+                } else if (status == 409) {
+                    $(modalPopupContent).html($('#group-409-content').html());
+                    $("a#group-409-link").click(function () {
+                        hidePopup();
+                    });
+                }
+            }, errorHandler
+        );
+    });
 
+    $("a#add-group-cancel-link").click(function () {
+        hidePopup();
     });
+
 }
 
 /**