Commit e93c975a010a5d7b0465de187b7469049642d7fc
Committed by
Andrew Shvayka
Andrew Shvayka
1 parent
77de9da2
Compound with front-end, fix of incorrect getter use
Showing
2 changed files
with
4 additions
and
4 deletions
| @@ -30,7 +30,7 @@ public class DynamicValue<T> { | @@ -30,7 +30,7 @@ public class DynamicValue<T> { | ||
| 30 | public DynamicValue(DynamicValueSourceType sourceType, String sourceAttribute) { | 30 | public DynamicValue(DynamicValueSourceType sourceType, String sourceAttribute) { |
| 31 | this.sourceAttribute = sourceAttribute; | 31 | this.sourceAttribute = sourceAttribute; |
| 32 | this.sourceType = sourceType; | 32 | this.sourceType = sourceType; |
| 33 | - this.inheritMode = false; | 33 | + this.inherit = false; |
| 34 | } | 34 | } |
| 35 | 35 | ||
| 36 | @Getter | 36 | @Getter |
| @@ -38,6 +38,6 @@ public class DynamicValue<T> { | @@ -38,6 +38,6 @@ public class DynamicValue<T> { | ||
| 38 | @Getter | 38 | @Getter |
| 39 | private final String sourceAttribute; | 39 | private final String sourceAttribute; |
| 40 | @Getter | 40 | @Getter |
| 41 | - private final boolean inheritMode; | 41 | + private final boolean inherit; |
| 42 | 42 | ||
| 43 | } | 43 | } |
| @@ -393,7 +393,7 @@ class AlarmRuleState { | @@ -393,7 +393,7 @@ class AlarmRuleState { | ||
| 393 | break; | 393 | break; |
| 394 | case CURRENT_CUSTOMER: | 394 | case CURRENT_CUSTOMER: |
| 395 | ekv = dynamicPredicateValueCtx.getCustomerValue(value.getDynamicValue().getSourceAttribute()); | 395 | ekv = dynamicPredicateValueCtx.getCustomerValue(value.getDynamicValue().getSourceAttribute()); |
| 396 | - if(ekv == null && value.getDynamicValue().getInheritMode()) { | 396 | + if(ekv == null && value.getDynamicValue().isInherit()) { |
| 397 | ekv = dynamicPredicateValueCtx.getTenantValue(value.getDynamicValue().getSourceAttribute()); | 397 | ekv = dynamicPredicateValueCtx.getTenantValue(value.getDynamicValue().getSourceAttribute()); |
| 398 | } | 398 | } |
| 399 | break; | 399 | break; |
| @@ -408,7 +408,7 @@ class AlarmRuleState { | @@ -408,7 +408,7 @@ class AlarmRuleState { | ||
| 408 | } | 408 | } |
| 409 | } | 409 | } |
| 410 | } | 410 | } |
| 411 | - if(ekv == null && value.getDynamicValue().getInheritMode()) { | 411 | + if(ekv == null && value.getDynamicValue().isInherit()) { |
| 412 | ekv = dynamicPredicateValueCtx.getCustomerValue(value.getDynamicValue().getSourceAttribute()); | 412 | ekv = dynamicPredicateValueCtx.getCustomerValue(value.getDynamicValue().getSourceAttribute()); |
| 413 | if(ekv == null) { | 413 | if(ekv == null) { |
| 414 | ekv = dynamicPredicateValueCtx.getTenantValue(value.getDynamicValue().getSourceAttribute()); | 414 | ekv = dynamicPredicateValueCtx.getTenantValue(value.getDynamicValue().getSourceAttribute()); |