Merge branch '5689-form-editor-display-columns' into 'master'

Bug #5689: Default BS Columns for FormElement match Form setting

See merge request !76

extension/qfq/sql/formEditor.sql

@@ -309,9 +309,9 @@ VALUES
                                                                                                                       '', '', 101, '', 'no', '', '', '', '', '', 'specialchar'),
   (2, 'tabindex', 'tabindex', 'show', 'text', 'all', 'native', 350, 0, 0, '<a href="{{documentation:Y}}#field-tabindex">Info</a>', '', '', '', '', 101, '', 'no', '', '', '', '', '', 'specialchar'),
   (2, 'size', 'Size', 'show', 'text', 'all', 'native', 400, 0, 0, '<a href="{{documentation:Y}}#field-size">Info</a>', '', '', '', '', 102, '', 'no', '', '', '', '', '', 'specialchar'),
-  (2, 'bsLabelColumns', 'BS Label Columns', 'show', 'text', 'all', 'native', 410, 0, 0, '<a href="{{documentation:Y}}#field-bslabelcolumns">Info</a>', '', '', '', '', 102, '', 'no', '', '', '', '', '{{bsLabelColumns:Y}}', 'specialchar'),
-  (2, 'bsInputColumns', 'BS Input Columns', 'show', 'text', 'all', 'native', 420, 0, 0, '', '', '', '', '', 102, '', 'no', '', '', '', '', '{{bsInputColumns:Y}}', 'specialchar'),
-  (2, 'bsNoteColumns', 'BS Note Columns', 'show', 'text', 'all', 'native', 430, 0, 0, '', '', '', '', '', 102, '', 'no', '', '', '', '', '{{bsNoteColumns:Y}}', 'specialchar'),
+  (2, 'bsLabelColumns', 'BS Label Columns', 'show', 'text', 'all', 'native', 410, 0, 0, '<a href="{{documentation:Y}}#field-bslabelcolumns">Info</a>', '', '', '', '', 102, '', 'no', '', '', '', '', '{{SELECT IF(f.bsLabelColumns != '''', f.bsLabelColumns, {{bsLabelColumns:Y}}) FROM Form AS f WHERE f.id = {{formId}} }}', 'specialchar'),
+  (2, 'bsInputColumns', 'BS Input Columns', 'show', 'text', 'all', 'native', 420, 0, 0, '', '', '', '', '', 102, '', 'no', '', '', '', '', '{{SELECT IF(f.bsInputColumns != '''', f.bsInputColumns, {{bsInputColumns:Y}}) FROM Form AS f WHERE f.id = {{formId}} }}', 'specialchar'),
+  (2, 'bsNoteColumns', 'BS Note Columns', 'show', 'text', 'all', 'native', 430, 0, 0, '', '', '', '', '', 102, '', 'no', '', '', '', '', '{{SELECT IF(f.bsNoteColumns != '''', f.bsNoteColumns, {{bsNoteColumns:Y}}) FROM Form AS f WHERE f.id = {{formId}} }}', 'specialchar'),
   (2, 'rowLabelInputNote', 'Label / Input / Note', 'show', 'checkbox', 'alnumx', 'native', 440, 0, 10, '<a href="{{documentation:Y}}#field-rowlabelinputnote">Info</a>', '', '', '', '', 102, '', 'no', '', '', '', '', '', 'specialchar'),
   (2, 'maxLength', 'Maxlength', 'show', 'text', 'all', 'native', 450, 0, 0, '<a href="{{documentation:Y}}#field-maxlength">Info</a>', '', '', '', '', 102, '', 'no', '', '', '', '', '', 'specialchar'),
   (2, 'note', 'Note', 'show', 'text', 'all', 'native', 460, '40,5', 0, '<a href="{{documentation:Y}}#field-note">Info</a>', '', '', '', '', 102, '', 'no', '', '', '', '', '', 'none'),