Commit 5d83d6c21c5ddcd0dbf170417c835d4455ff3093
Committed by
Igor Kulikov
1 parent
fc781864
Fix not work in the autocomplete tooltip action create datakey (#2139)
Showing
2 changed files
with
6 additions
and
2 deletions
... | ... | @@ -165,7 +165,11 @@ function DatasourceEntity($compile, $templateCache, $q, $mdDialog, $window, $doc |
165 | 165 | }; |
166 | 166 | |
167 | 167 | scope.transformAlarmDataKeyChip = function (chip) { |
168 | - return scope.generateDataKey({chip: chip, type: types.dataKeyType.alarm}); | |
168 | + if (chip.type) { | |
169 | + return scope.generateDataKey({chip: chip.name, type: chip.type}); | |
170 | + } else { | |
171 | + return scope.generateDataKey({chip: chip, type: types.dataKeyType.alarm}); | |
172 | + } | |
169 | 173 | }; |
170 | 174 | |
171 | 175 | scope.showColorPicker = function (event, dataKey) { | ... | ... |
... | ... | @@ -125,7 +125,7 @@ |
125 | 125 | <div ng-if="textIsNotEmpty(alarmDataKeySearchText)"> |
126 | 126 | <span translate translate-values='{ key: "{{alarmDataKeySearchText | truncate:true:6:'...'}}" }'>entity.no-key-matching</span> |
127 | 127 | <span> |
128 | - <a translate ng-click="createKey($event, '#alarm_datakey_chips')">entity.create-new-key</a> | |
128 | + <a translate ng-click="createKey($event, types.dataKeyType.alarm, '#alarm_datakey_chips')">entity.create-new-key</a> | |
129 | 129 | </span> |
130 | 130 | </div> |
131 | 131 | </div> | ... | ... |