IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

TimeRegions: Fixed issue with time regions and tresholds due to angular js upgrade (#29229)

Browse Source
This commit is contained in:
Torkel Ödegaard 2020-11-19 14:37:04 +01:00 committed by GitHub
parent 32d4c8c6bc
commit 993adb72e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/plugins/panel/graph/thresholds_form.ts
View File

@ -7,14 +7,16 @@ export class ThresholdFormCtrl {
disabled: boolean; disabled: boolean;
/** @ngInject */ /** @ngInject */
constructor($scope: any) { constructor(private $scope: any) {}
$onInit() {
this.panel = this.panelCtrl.panel; this.panel = this.panelCtrl.panel;
if (this.panel.alert) { if (this.panel.alert) {
this.disabled = true; this.disabled = true;
} }
const unbindDestroy = $scope.$on('$destroy', () => { const unbindDestroy = this.$scope.$on('$destroy', () => {
this.panelCtrl.editingThresholds = false; this.panelCtrl.editingThresholds = false;
this.panelCtrl.render(); this.panelCtrl.render();
unbindDestroy(); unbindDestroy();

6
public/app/plugins/panel/graph/time_regions_form.ts
View File

@ -8,10 +8,12 @@ export class TimeRegionFormCtrl {
colorModes: any; colorModes: any;
/** @ngInject */ /** @ngInject */
constructor($scope: any) { constructor(private $scope: any) {}
$onInit() {
this.panel = this.panelCtrl.panel; this.panel = this.panelCtrl.panel;
const unbindDestroy = $scope.$on('$destroy', () => { const unbindDestroy = this.$scope.$on('$destroy', () => {
this.panelCtrl.editingTimeRegions = false; this.panelCtrl.editingTimeRegions = false;
this.panelCtrl.render(); this.panelCtrl.render();
unbindDestroy(); unbindDestroy();