Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins

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

@@ -37,6 +37,7 @@
                                     </span>
                                     View
                                 </a>
+                                {{#if permissions.ENROLL_DEVICE)}}
                                     <a href="javascript:toggleEnrollment()">
                                     <span class="fw-stack">
                                         <i class="fw fw-ring fw-stack-2x"></i>
@@ -44,6 +45,7 @@
                                     </span>
                                     Add
                                 </a>
+                                {{/if}}
                             </span>
                         </div>
                     </div>

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;

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;