From 77ec1c4107466879f263f1ec08daf919faf89423 Mon Sep 17 00:00:00 2001
From: ayyoob <ayyoobhamza@gmail.com>
Date: Thu, 2 Mar 2017 20:27:46 +0530
Subject: [PATCH 1/2] fixed operation bar permission rendering issue

---
 .../app/modules/business-controllers/operation.js  | 14 +++++++++++++-
 .../operation-bar.hbs                              |  5 -----
 .../operation-bar.js                               |  4 ++--
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/modules/business-controllers/operation.js b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/modules/business-controllers/operation.js
index e96ffcdec..58d0f5f2b 100755
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/modules/business-controllers/operation.js
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/modules/business-controllers/operation.js
@@ -60,7 +60,19 @@ var operationModule = function () {
                     feature["description"] = features[i].description;
                     feature["deviceType"] = deviceType;
                     feature["params"] = [];
-                    var metaData = features[i].metadataEntries;
+					var featuresEntry = utility.getDeviceTypeConfig(deviceType)["deviceType"]["features"];
+					if (featuresEntry) {
+						var featureEntry = featuresEntry[features[i].code];
+						if (featureEntry) {
+							var permissionEntry = featureEntry["permission"];
+							log.error(permissionEntry);
+							if (permissionEntry) {
+								feature["permission"] = permissionEntry
+							}
+						}
+					}
+
+					var metaData = features[i].metadataEntries;
                     if (metaData) {
                         for (var j = 0; j < metaData.length; j++) {
                             feature["params"].push(metaData[j].value);
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/operation-bar.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/operation-bar.hbs
index 688302a90..3a5a60956 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/operation-bar.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/operation-bar.hbs
@@ -113,11 +113,6 @@
             </div>
         {{/each}}
     </div>
-{{else}}
-    <div align="center">
-        <h4 style="color: #D8000C"><i class="icon fw fw-error" style="color: #D8000C"></i>
-            Operations Loading Failed!</h4>
-    </div>
 {{/if}}
 
 <div id="operation-response-template" style="display: none">
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/operation-bar.js b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/operation-bar.js
index a26d0a883..588380a8e 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/operation-bar.js
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/operation-bar.js
@@ -31,8 +31,8 @@ function onRequest(context) {
     var pathParams = [];
     for (var i = 0; i < allControlOps.length; i++) {
         var controlOperation = {};
-        var uiPermission = allControlOps[i]["uiPermission"];
-        if (uiPermission && !userModule.isAuthorized("/permission/admin/" + uiPermission)) {
+        var uiPermission = allControlOps[i]["permission"];
+        if (uiPermission && !userModule.isAuthorized("/permission/admin" + uiPermission)) {
             continue;
         }
         controlOperation = allControlOps[i];

From a10eb7cb142fd46bd04ca554a2925da21bb935b0 Mon Sep 17 00:00:00 2001
From: ayyoob <ayyoobhamza@gmail.com>
Date: Fri, 3 Mar 2017 17:03:57 +0530
Subject: [PATCH 2/2] removed feature

---
 .../app/modules/business-controllers/operation.js    | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/modules/business-controllers/operation.js b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/modules/business-controllers/operation.js
index 58d0f5f2b..e97e0afb9 100755
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/modules/business-controllers/operation.js
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/modules/business-controllers/operation.js
@@ -60,18 +60,6 @@ var operationModule = function () {
                     feature["description"] = features[i].description;
                     feature["deviceType"] = deviceType;
                     feature["params"] = [];
-					var featuresEntry = utility.getDeviceTypeConfig(deviceType)["deviceType"]["features"];
-					if (featuresEntry) {
-						var featureEntry = featuresEntry[features[i].code];
-						if (featureEntry) {
-							var permissionEntry = featureEntry["permission"];
-							log.error(permissionEntry);
-							if (permissionEntry) {
-								feature["permission"] = permissionEntry
-							}
-						}
-					}
-
 					var metaData = features[i].metadataEntries;
                     if (metaData) {
                         for (var j = 0; j < metaData.length; j++) {