Browse Source

Fix not work in the autocomplete tooltip action create datakey (#2139)

pull/2163/head
Vladyslav 7 years ago
committed by Igor Kulikov
parent
commit
5d83d6c21c
  1. 6
      ui/src/app/components/datasource-entity.directive.js
  2. 2
      ui/src/app/components/datasource-entity.tpl.html

6
ui/src/app/components/datasource-entity.directive.js

@ -165,7 +165,11 @@ function DatasourceEntity($compile, $templateCache, $q, $mdDialog, $window, $doc
};
scope.transformAlarmDataKeyChip = function (chip) {
return scope.generateDataKey({chip: chip, type: types.dataKeyType.alarm});
if (chip.type) {
return scope.generateDataKey({chip: chip.name, type: chip.type});
} else {
return scope.generateDataKey({chip: chip, type: types.dataKeyType.alarm});
}
};
scope.showColorPicker = function (event, dataKey) {

2
ui/src/app/components/datasource-entity.tpl.html

@ -125,7 +125,7 @@
<div ng-if="textIsNotEmpty(alarmDataKeySearchText)">
<span translate translate-values='{ key: "{{alarmDataKeySearchText | truncate:true:6:&apos;...&apos;}}" }'>entity.no-key-matching</span>
<span>
<a translate ng-click="createKey($event, '#alarm_datakey_chips')">entity.create-new-key</a>
<a translate ng-click="createKey($event, types.dataKeyType.alarm, '#alarm_datakey_chips')">entity.create-new-key</a>
</span>
</div>
</div>

Loading…
Cancel
Save