Commit bd1ef13a5da8e14a62e8a22004610046d351aa89
Merge branch 'master' of github.com:thingsboard/thingsboard into feature/external-js-eval
Showing
2 changed files
with
2 additions
and
2 deletions
| @@ -83,7 +83,7 @@ public class AlarmController extends BaseController { | @@ -83,7 +83,7 @@ public class AlarmController extends BaseController { | ||
| 83 | Alarm savedAlarm = checkNotNull(alarmService.createOrUpdateAlarm(alarm)); | 83 | Alarm savedAlarm = checkNotNull(alarmService.createOrUpdateAlarm(alarm)); |
| 84 | logEntityAction(savedAlarm.getId(), savedAlarm, | 84 | logEntityAction(savedAlarm.getId(), savedAlarm, |
| 85 | getCurrentUser().getCustomerId(), | 85 | getCurrentUser().getCustomerId(), |
| 86 | - savedAlarm.getId() == null ? ActionType.ADDED : ActionType.UPDATED, null); | 86 | + alarm.getId() == null ? ActionType.ADDED : ActionType.UPDATED, null); |
| 87 | return savedAlarm; | 87 | return savedAlarm; |
| 88 | } catch (Exception e) { | 88 | } catch (Exception e) { |
| 89 | logEntityAction(emptyId(EntityType.ALARM), alarm, | 89 | logEntityAction(emptyId(EntityType.ALARM), alarm, |
| @@ -209,7 +209,7 @@ export default class CanvasDigitalGauge extends canvasGauges.BaseGauge { | @@ -209,7 +209,7 @@ export default class CanvasDigitalGauge extends canvasGauges.BaseGauge { | ||
| 209 | this.elementValueClone.renderedValue = this._value; | 209 | this.elementValueClone.renderedValue = this._value; |
| 210 | } | 210 | } |
| 211 | if (angular.isUndefined(this.elementValueClone.renderedValue)) { | 211 | if (angular.isUndefined(this.elementValueClone.renderedValue)) { |
| 212 | - this.elementValueClone.renderedValue = options.minValue; | 212 | + this.elementValueClone.renderedValue = this.value; |
| 213 | } | 213 | } |
| 214 | let context = this.contextValueClone; | 214 | let context = this.contextValueClone; |
| 215 | // clear the cache | 215 | // clear the cache |