From 2b2db7be395df38726700ab810be70a0f42005b1 Mon Sep 17 00:00:00 2001
From: kamidu <sachithp@wso2.com>
Date: Fri, 9 Sep 2016 18:43:03 +0530
Subject: [PATCH 1/2] permission modifications

---
 .../pages/mdm.page.dashboard/dashboard.hbs    | 86 ++++++++++---------
 .../app/pages/mdm.page.dashboard/dashboard.js |  3 +
 2 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.hbs
index 0bf54e2c2..fbc3f2753 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.hbs
@@ -19,15 +19,15 @@
 {{unit "cdmf.unit.lib.qrcode"}}
 {{unit "mdm.unit.device.qr-modal"}}
 {{#zone "content"}}
-        {{#if permissions.LIST_DEVICES}}
-            <div class="row ">
-                <div class="col-md-3 wr-stats-board">
-                    <div class="wr-stats-board-tile">
-                        <div class="tile-name">Devices</div>
-                        <div>
-                            <div class="tile-icon"><i class="fw fw-mobile"></i></div>
-                            <div class="tile-stats">
-                                <span id="device-count" data-device-count="true">Loading...</span>
+    {{#if permissions.LIST_DEVICES}}
+        <div class="row ">
+            <div class="col-md-3 wr-stats-board">
+                <div class="wr-stats-board-tile">
+                    <div class="tile-name">Devices</div>
+                    <div>
+                        <div class="tile-icon"><i class="fw fw-mobile"></i></div>
+                        <div class="tile-stats">
+                            <span id="device-count" data-device-count="true">Loading...</span>
                             <span class="tile-stats-free">
                                 <!--suppress HtmlUnknownTarget -->
                                 <a id="device-count-view-btn" href="{{@app.context}}/devices">
@@ -37,27 +37,29 @@
                                     </span>
                                     View
                                 </a>
-                                <a href="javascript:toggleEnrollment()">
+                                {{#if permissions.ENROLL_DEVICE)}}
+                                    <a href="javascript:toggleEnrollment()">
                                     <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>
+                                {{/if}}
                             </span>
-                            </div>
                         </div>
                     </div>
                 </div>
-        {{/if}}
-        {{# if permissions.LIST_POLICIES}}
-                <div class="col-md-3 wr-stats-board">
-                    <div class="wr-stats-board-tile">
-                        <div class="tile-name">Policies</div>
-                        <div>
-                            <div class="tile-icon"><i class="fw fw-policy"></i></div>
-                            <div class="tile-stats">
-                                <span id="policy-count" data-policy-count="true">Loading...</span>
+            </div>
+    {{/if}}
+    {{# if permissions.LIST_POLICIES}}
+            <div class="col-md-3 wr-stats-board">
+                <div class="wr-stats-board-tile">
+                    <div class="tile-name">Policies</div>
+                    <div>
+                        <div class="tile-icon"><i class="fw fw-policy"></i></div>
+                        <div class="tile-stats">
+                            <span id="policy-count" data-policy-count="true">Loading...</span>
                             <span class="tile-stats-free">
                                 <!--suppress HtmlUnknownTarget -->
                                 <a id="policy-count-view-btn" href="{{@app.context}}/policies/">
@@ -78,19 +80,19 @@
                                     </a>
                                 {{/if}}
                             </span>
-                            </div>
                         </div>
                     </div>
                 </div>
-        {{/if}}
-        {{# if permissions.LIST_USERS}}
-                <div class="col-md-3 wr-stats-board">
-                    <div class="wr-stats-board-tile">
-                        <div class="tile-name">Users</div>
-                        <div>
-                            <div class="tile-icon"><i class="fw fw-user"></i></div>
-                            <div class="tile-stats">
-                                <span id="user-count" data-user-count="true">Loading...</span>
+            </div>
+    {{/if}}
+    {{# if permissions.LIST_USERS}}
+            <div class="col-md-3 wr-stats-board">
+                <div class="wr-stats-board-tile">
+                    <div class="tile-name">Users</div>
+                    <div>
+                        <div class="tile-icon"><i class="fw fw-user"></i></div>
+                        <div class="tile-stats">
+                            <span id="user-count" data-user-count="true">Loading...</span>
                             <span class="tile-stats-free">
                                 <!--suppress HtmlUnknownTarget -->
                                 <a id="user-count-view-btn" href="{{@app.context}}/users/">
@@ -111,19 +113,19 @@
                                     </a>
                                 {{/if}}
                             </span>
-                            </div>
                         </div>
                     </div>
                 </div>
-        {{/if}}
-        {{# if permissions.LIST_ROLES}}
-                <div class="col-md-3 wr-stats-board">
-                    <div class="wr-stats-board-tile">
-                        <div class="tile-name">Roles</div>
-                        <div>
-                            <div class="tile-icon"><i class="fw fw-bookmark"></i></div>
-                            <div class="tile-stats">
-                                <span id="role-count" data-role-count="true">Loading...</span>
+            </div>
+    {{/if}}
+    {{# if permissions.LIST_ROLES}}
+            <div class="col-md-3 wr-stats-board">
+                <div class="wr-stats-board-tile">
+                    <div class="tile-name">Roles</div>
+                    <div>
+                        <div class="tile-icon"><i class="fw fw-bookmark"></i></div>
+                        <div class="tile-stats">
+                            <span id="role-count" data-role-count="true">Loading...</span>
                             <span class="tile-stats-free">
                                 <!--suppress HtmlUnknownTarget -->
                                 <a id="device-count-view-btn" href="{{@app.context}}/roles">
@@ -144,12 +146,12 @@
                                     </a>
                                 {{/if}}
                             </span>
-                            </div>
                         </div>
                     </div>
                 </div>
             </div>
-        {{/if}}
+        </div>
+    {{/if}}
 {{/zone}}
 {{#zone "bottomJs"}}
     {{js "js/dashboard.js"}}
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.js
index a6c495532..e1480d31c 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.js
@@ -29,6 +29,9 @@ function onRequest(context) {
     permissions.ADD_POLICY = userModule.isAuthorized("/permission/admin/device-mgt/policies/manage");
     permissions.ADD_ROLE = userModule.isAuthorized("/permission/admin/device-mgt/roles/manage");
     permissions.ADD_USER = userModule.isAuthorized("/permission/admin/device-mgt/users/manage");
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/enroll/ios") | userModule.isAuthorized("/permission/admin/devices/enroll/android") | userModule.isAuthorized("/permission/admin/device-mgt/devices/enroll/windows") ){
+        permissions.ENROLL_DEVICE = true;
+    }
     viewModel.permissions = permissions;
     //TODO: Move enrollment URL into app-conf.json
     viewModel.enrollmentURL = mdmProps.generalConfig.host +  mdmProps.enrollmentDir;

From 6ee9a61ed15f7a1ab4563fae6e9122e099ff958f Mon Sep 17 00:00:00 2001
From: dilanua <dilan.u.ariyaratne@gmail.com>
Date: Mon, 12 Sep 2016 14:20:01 +0530
Subject: [PATCH 2/2] Fixing json parser issue in operation-bar - UI

---
 .../mdm.unit.device.operation-bar/public/js/operation-bar.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/public/js/operation-bar.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/public/js/operation-bar.js
index cc3d8d962..a3186092a 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/public/js/operation-bar.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/public/js/operation-bar.js
@@ -110,7 +110,7 @@ function loadOperationBar(deviceType) {
         var successCallback = function (data) {
             var permittedOperations = [];
             var i;
-            var permissionList = JSON.parse($("#operations-mod").data("permissions"));
+            var permissionList = $("#operations-mod").data("permissions");
             var totalFeatures = JSON.parse(data);
             for (i = 0; i < permissionList[deviceType].length; i++) {
                 var j;