From 7537b979b3156219c48205ca3812d0a424590690 Mon Sep 17 00:00:00 2001
From: hrushikesh07 <hrushikesh.das@relevancelab.com>
Date: Wed, 14 Dec 2016 14:40:24 +0530
Subject: [PATCH] Array name changed

---
 .../analytics/controller/discoveryResourcesCtrl.js          | 4 +++-
 .../analytics/controller/discoveryTagMappingCtrl.js         | 2 +-
 .../dashboard/analytics/view/discoveryTagMapping.html       | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js
index 5f98b545f..6c4829c8b 100644
--- a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js
@@ -3,6 +3,7 @@
     angular.module('dashboard.analytics')
         .controller('discoveryResourcesCtrl', ['$scope', '$rootScope', '$state','analyticsServices', 'genericServices','$timeout', function ($scope,$rootScope,$state,analyticsServices,genSevs,$timeout){
             var disResrc=this;
+            $scope.tagValue=[{'id':'a','value':'a'},{'id':'b','value':'b'}]
             disResrc.gridOptionInstances = {
                 columnDefs : [
                 { name: 'InstanceId',field:'platformId' },
@@ -10,7 +11,8 @@
                 { name: 'privateIpAddress', displayName: 'IP Address'},
                 { name: 'state', displayName: 'Status'},
                 { name: 'Region', displayName: 'Region',field:'providerData.region_name',cellTooltip: true},
-                { name: 'Bg Tag Value',width:300,field:'bg', enableCellEdit: true,editableCellTemplate:'<select ng-class="\'colt\' + col.index" ng-input="COL_FIELD" ng-model="COL_FIELD" ><option value="a">a</option><option value="b">b</option> </select>'},
+                { name: 'Bg Tag Value',width:300, enableCellEdit: true,editableCellTemplate: 'ui-grid/dropdownEditor',
+                    editDropdownOptionsArray: $scope.tagValue},
                 { name: 'Project Tag Value', enableCellEdit: true},
                 { name: 'Env. Tag Value', enableCellEdit: true}
             ]
diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js
index 03d202726..54afaa324 100644
--- a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js
@@ -36,7 +36,7 @@
                     genSevs.promiseGet(param).then(function (tagResult) {
                         $scope.isLoadingTagValue = false;
                         for (var key in $scope.newEnt[valueType].catalystEntityMapping) {
-                            $scope.newEnt[valueType].catalystEntityMapping[key].tagValue = [];
+                            $scope.newEnt[valueType].catalystEntityMapping[key].tagValues = [];
                         }
                         ;
                         disTgMap[type] = tagResult.values;
diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryTagMapping.html b/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryTagMapping.html
index 7f2fb15f7..17680da44 100644
--- a/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryTagMapping.html
+++ b/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryTagMapping.html
@@ -32,7 +32,7 @@
                                 </label>
                                 <div class="input-groups" ng-init="newEnt.businessGroup.catalystEntityMapping[buss.rowid].catalystEntityName =buss.name ; newEnt.businessGroup.catalystEntityMapping[buss.rowid].catalystEntityId =buss.rowid ">
                                     <loading size="small" name="isLoadingTag" type="inline"></loading>
-                                    <multiple-autocomplete ng-model="newEnt.businessGroup.catalystEntityMapping[buss.rowid].tagValue"
+                                    <multiple-autocomplete ng-model="newEnt.businessGroup.catalystEntityMapping[buss.rowid].tagValues"
                                                            suggestions-arr="disTgMap.busTag">
                                     </multiple-autocomplete>
                                 </div>
@@ -78,7 +78,7 @@
                             </label>
                             <div class="input-groups" ng-init="newEnt.project.catalystEntityMapping[project.rowId].catalystEntityName =project.name ; newEnt.project.catalystEntityMapping[project.rowId].catalystEntityId =project.rowId ">
                                 <loading size="small" name="isLoadingTag" type="inline"></loading>
-                                <multiple-autocomplete ng-model="newEnt.project.catalystEntityMapping[project.rowId].tagValue"
+                                <multiple-autocomplete ng-model="newEnt.project.catalystEntityMapping[project.rowId].tagValues"
                                                        suggestions-arr="disTgMap.projTag">
                                 </multiple-autocomplete>
                             </div>
@@ -119,7 +119,7 @@
                             </label>
                             <div class="input-groups" ng-init="newEnt.environment.catalystEntityMapping[envr.rowid].catalystEntityName =envr.name ; newEnt.environment.catalystEntityMapping[envr.rowid].catalystEntityId =envr.rowid ">
                                 <loading size="small" name="isLoadingTag" type="inline"></loading>
-                                <multiple-autocomplete ng-model="newEnt.environment.catalystEntityMapping[envr.rowid].tagValue"
+                                <multiple-autocomplete ng-model="newEnt.environment.catalystEntityMapping[envr.rowid].tagValues"
                                                        suggestions-arr="disTgMap.EnvTag">
                                 </multiple-autocomplete>
                             </div>