Merge from develop
This commit is contained in:
commit
09c04d02b1
|
@ -1 +1 @@
|
|||
Subproject commit 40ef9507150f90d9e50298adb23c29b3d5a9745b
|
||||
Subproject commit 55a995a34890318b024d458cdd978a9d044d8b47
|
|
@ -161,7 +161,7 @@ export class CriteriaComponent implements OnInit, OnChanges, AfterViewInit, OnDe
|
|||
}
|
||||
|
||||
get dirty() {
|
||||
if (!this.selectionCriteria || !this.criteria) {
|
||||
if (!this.selectionCriteria && !this.criteria) {
|
||||
return false;
|
||||
} else if (this.criteria.length !== this.criteriaArray.length) {
|
||||
return true;
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit d52e92929799a1626aff66ad413c6db2be521555
|
||||
Subproject commit 5feca2d8457324999557feb662b4355d8cf0df4b
|
Loading…
Reference in New Issue