From 3727519e511597dc7ec2d7db828976f1bae20eda Mon Sep 17 00:00:00 2001 From: Sergey Tarnavskiy Date: Wed, 19 Sep 2018 12:27:38 +0300 Subject: [PATCH 1/2] fixed issue with gauge value --- ui/src/app/widget/lib/CanvasDigitalGauge.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/app/widget/lib/CanvasDigitalGauge.js b/ui/src/app/widget/lib/CanvasDigitalGauge.js index ee8b0ed559..331ce6c5aa 100644 --- a/ui/src/app/widget/lib/CanvasDigitalGauge.js +++ b/ui/src/app/widget/lib/CanvasDigitalGauge.js @@ -209,7 +209,7 @@ export default class CanvasDigitalGauge extends canvasGauges.BaseGauge { this.elementValueClone.renderedValue = this._value; } if (angular.isUndefined(this.elementValueClone.renderedValue)) { - this.elementValueClone.renderedValue = options.minValue; + this.elementValueClone.renderedValue = this.value; } let context = this.contextValueClone; // clear the cache From 601efbc9317a0f65df0413bc800ad25870e3ebc3 Mon Sep 17 00:00:00 2001 From: Andrew Shvayka Date: Wed, 26 Sep 2018 14:57:43 +0300 Subject: [PATCH 2/2] Fixed action type for alarm audit log --- .../java/org/thingsboard/server/controller/AlarmController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/src/main/java/org/thingsboard/server/controller/AlarmController.java b/application/src/main/java/org/thingsboard/server/controller/AlarmController.java index 586e8c35ef..00885e34b0 100644 --- a/application/src/main/java/org/thingsboard/server/controller/AlarmController.java +++ b/application/src/main/java/org/thingsboard/server/controller/AlarmController.java @@ -83,7 +83,7 @@ public class AlarmController extends BaseController { Alarm savedAlarm = checkNotNull(alarmService.createOrUpdateAlarm(alarm)); logEntityAction(savedAlarm.getId(), savedAlarm, getCurrentUser().getCustomerId(), - savedAlarm.getId() == null ? ActionType.ADDED : ActionType.UPDATED, null); + alarm.getId() == null ? ActionType.ADDED : ActionType.UPDATED, null); return savedAlarm; } catch (Exception e) { logEntityAction(emptyId(EntityType.ALARM), alarm,