Merge pull request #15 from blocknotes/fix-evaluate-condition-data-if

Mattia Roccoberton · web-flow · commit 395cdd940809 · 2022-03-09T08:51:00.000+01:00
Fix evaluate condition data-if
diff --git a/app/assets/javascripts/activeadmin/dynamic_fields.js b/app/assets/javascripts/activeadmin/dynamic_fields.js
@@ -91,7 +91,8 @@
     }
 
     evaluateCondition() {
-      let value = CONDITIONS[this.el.data('if')?.trim()]
+      let data_if = this.el.data('if')
+      let value = data_if ? CONDITIONS[data_if.trim()] : null
       if (value) return { condition: value }
 
       value = this.el.data('eq')

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,8 @@`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`evaluateCondition() {`
`94`		`- let value = CONDITIONS[this.el.data('if')?.trim()]`
	`94`	`+ let data_if = this.el.data('if')`
	`95`	`+ let value = data_if ? CONDITIONS[data_if.trim()] : null`
`95`	`96`	`if (value) return { condition: value }`
`96`	`97`
`97`	`98`	`value = this.el.data('eq')`