fraport/fradrive
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix issue with conditional fieldsets in modals

Browse Source
This commit is contained in:
Felix Hamann 2019-04-09 22:14:05 +02:00
parent 559fb3fb9d
commit 09a5ab94dd
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
static/js/utils/form.js
View File

@ -159,7 +159,7 @@
if (!element.dataset.conditionalInput) { if (!element.dataset.conditionalInput) {
throw new Error('Interactive Fieldset needs a selector for a conditional input!'); throw new Error('Interactive Fieldset needs a selector for a conditional input!');
} }
conditionalInput = document.querySelector(element.dataset.conditionalInput); conditionalInput = document.querySelector('#' + element.dataset.conditionalInput);
if (!conditionalInput) { if (!conditionalInput) {
// abort if form has no required inputs // abort if form has no required inputs
throw new Error('Couldn\'t find the conditional input. Aborting setup for interactive fieldset.'); throw new Error('Couldn\'t find the conditional input. Aborting setup for interactive fieldset.');

4
static/js/utils/modal.js
View File

@ -173,9 +173,9 @@
} }
function withPrefixedInputIDs(modalContent) { function withPrefixedInputIDs(modalContent) {
var idAttrs = ['id', 'for', 'data-conditional-id']; var idAttrs = ['id', 'for', 'data-conditional-input'];
idAttrs.forEach(function(attr) { idAttrs.forEach(function(attr) {
modalContent.querySelectorAll('[' + attr + ']').forEach(function(input) { Array.from(modalContent.querySelectorAll('[' + attr + ']')).forEach(function(input) {
var value = element.id + '__' + input.getAttribute(attr); var value = element.id + '__' + input.getAttribute(attr);
input.setAttribute(attr, value); input.setAttribute(attr, value);
}); });

2
templates/widgets/multi-action/multi-action.hamlet
View File

@ -1,4 +1,4 @@
<fieldset uw-interactive-fieldset data-conditional-input="##{fvId actionView}" data-conditional-value="#{toPathPiece act}"> <fieldset uw-interactive-fieldset data-conditional-input=#{fvId actionView} data-conditional-value=#{toPathPiece act}>
<legend> <legend>
_{act} _{act}
^{w} ^{w}