Commit 958648d5 authored by Arnold Hendriks's avatar Arnold Hendriks

Merge branch 'feature/more-form-improvements' into 'master'

More form improvements

See merge request webhare/platform!241
parents 4b0fd939 b9b17e34
......@@ -685,7 +685,7 @@ export default class FormBase
}
}
for(let option of dompack.qSA(this.node, "select > option"))
for(let option of dompack.qSA(this.node, ".wh-form__fieldgroup select > option"))
{
let formgroup = dompack.closest(option, ".wh-form__fieldgroup");
let visible = !hiddengroups.includes(formgroup) && this._matchesCondition(option.dataset.whFormVisibleIf);
......
......@@ -135,6 +135,8 @@ STATIC OBJECTTYPE FormPage
IF (this->title != "")
Print(` data-wh-form-pagetitle="${EncodeValue(this->title)}"`);
IF (this->page.name != "")
Print(` data-wh-form-pagename="${EncodeValue(this->page.name)}"`);
IF (this->page.role != "")
{
Print(` data-wh-form-pagerole="${EncodeValue(this->page.role)}"`);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment