From 5ff3ba3fcc030bed0f5dd0d216f739566b60d47e Mon Sep 17 00:00:00 2001
From: charitha <charitha.ws@gmail.com>
Date: Tue, 21 Mar 2017 11:14:27 +0530
Subject: [PATCH] Fix issue in showing dynamic icons

---
 .../modules/business-controllers/operation.js    | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/operation.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/operation.js
index e9c07ee0ba9..dd200cdfbe4 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/operation.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/operation.js
@@ -81,21 +81,11 @@ var operationModule = function () {
 
     publicMethods.getControlOperations = function (deviceType) {
         var operations = privateMethods.getOperationsFromFeatures(deviceType, "operation");
-        var features = utility.getDeviceTypeConfig(deviceType).deviceType.features;
         for (var op in operations) {
             var iconIdentifier = operations[op].operation;
-            if (features && features[iconIdentifier]) {
-                var icon = features[iconIdentifier].icon;
-                if (icon) {
-                    operations[op]["iconFont"] = icon;
-                } else if (iconPath) {
-                    var iconPath = utility.getOperationIcon(deviceType, iconIdentifier);
-                    operations[op]["icon"] = iconPath;
-                }
-                var formParams = features[iconIdentifier].formParams;
-                if (formParams) {
-                    operations[op]["uiParams"] = formParams;
-                }
+            var icon = utility.getOperationIcon(deviceType, iconIdentifier);
+            if (icon) {
+                operations[op]["icon"] = icon;
             }
         }
         return operations;