diff --git a/app/Rules/CustomFieldValidationRule.php b/app/Rules/CustomFieldValidationRule.php index f3182364..100ebedd 100644 --- a/app/Rules/CustomFieldValidationRule.php +++ b/app/Rules/CustomFieldValidationRule.php @@ -26,10 +26,10 @@ class CustomFieldValidationRule implements Rule public function passes($attribute, $value) { if (!($this->validation['error_conditions']['conditions'] ?? null) || is_null( - $this->validation['error_conditions']['conditions'] ?? null - )) { - return true; - } + $this->validation['error_conditions']['conditions'] ?? null + )) { + return true; + } return FormLogicConditionChecker::conditionsMet( $this->validation['error_conditions']['conditions'], $this->formData diff --git a/client/components/open/tables/OpenTable.vue b/client/components/open/tables/OpenTable.vue index c152ee49..a541cfa1 100644 --- a/client/components/open/tables/OpenTable.vue +++ b/client/components/open/tables/OpenTable.vue @@ -209,24 +209,24 @@ export default { } }, + computed: { + formData() { + return [...this.data].sort((a, b) => new Date(b.created_at) - new Date(a.created_at)) + } + }, + watch: { columns: { handler() { this.internalColumns = clonedeep(this.columns) this.onStructureChange() }, - deep: true, + deep: true }, data() { this.$nextTick(() => { this.handleScroll() }) - }, - }, - - computed: { - formData(){ - return this.data.sort((a, b) => new Date(b.created_at) - new Date(a.created_at)); } },