Skip to content

Array name changed #1031

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 14, 2016
Merged

Array name changed #1031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,16 @@
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' },
{ name: 'os', displayName:'OS', enableCellEdit: true, type: 'number'},
{ 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}
]
Expand Down
2 changes: 1 addition & 1 deletion client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions client/cat3/src/partials/sections/dashboard/analytics/view/discoveryTagMapping.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down