From a938d57a657267e4a3f0b0c3d5fe68537d4f73b1 Mon Sep 17 00:00:00 2001
From: Imesh Chandrasiri <dimal.chandrasiri@gmail.com>
Date: Mon, 20 Feb 2017 15:11:00 +0530
Subject: [PATCH 1/2] Removing analytics link from groups listing

---
 .../app/pages/cdmf.page.groups/public/js/listing.js        | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js
index 91333c5b5d..d3987517dd 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js
@@ -184,12 +184,11 @@ function loadGroups() {
             render: function (id, type, row, meta) {
                 var html = '';
                 if ($.hasPermission("VIEW_GROUP_DEVICES")) {
-                    html += '<a href="group/' + row.groupId
-                            + '/analytics" data-click-event="remove-form" class="btn padding-reduce-on-grid-view" ' +
-                            'data-placement="top" data-toggle="tooltip" data-original-title="Analytics">' +
+                    /*html += '<a href="group/' + row.groupId
+                            + '/analytics" data-click-event="remove-form" class="btn padding-reduce-on-grid-view">' +
                             '<span class="fw-stack"><i class="fw fw-circle-outline fw-stack-2x"></i><i class="fw fw-statistics fw-stack-1x"></i></span>'
                             +
-                            '<span class="hidden-xs hidden-on-grid-view">Analytics</span></a>';
+                            '<span class="hidden-xs hidden-on-grid-view">Analytics</span></a>';*/
                 }
                 if (row.owner != "wso2.system.user") {
                     if ($.hasPermission("SHARE_GROUP")) {

From 3c90f8ad49cc020202b12c0a483a33c7d00701f0 Mon Sep 17 00:00:00 2001
From: Imesh Chandrasiri <dimal.chandrasiri@gmail.com>
Date: Mon, 20 Feb 2017 17:19:20 +0530
Subject: [PATCH 2/2] temporary removal of view analytics

---
 .../devicemgt/app/pages/cdmf.page.devices/devices.hbs         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs
index 354c6f2bb7..bdd2e9d39b 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs
@@ -57,7 +57,7 @@
                 Assign from My Devices
             </a>
         </li>
-        <li>
+        <!--<li>
             <a href="{{@app.context}}/group/{{group.id}}/analytics" class="cu-btn">
             <span class="icon fw-stack">
                 <i class="fw fw-statistics fw-stack-1x"></i>
@@ -65,7 +65,7 @@
             </span>
                 View Analytics
             </a>
-        </li>
+        </li>-->
     {{else}}
         {{#if permissions.enroll}}
             <li>