From a2ef3c906e8aef280097c3cdfc5f35b04bc167d7 Mon Sep 17 00:00:00 2001
From: Carsten Rose <carsten.rose@math.uzh.ch>
Date: Fri, 17 Mar 2017 13:20:45 +0100
Subject: [PATCH] formEditor.sql: order and columns of Container elements
rearranged.
---
extension/Documentation/Manual.rst | 6 +++++-
extension/qfq/sql/formEditor.sql | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/extension/Documentation/Manual.rst b/extension/Documentation/Manual.rst
index fc6fb1a4b..b18082035 100644
--- a/extension/Documentation/Manual.rst
+++ b/extension/Documentation/Manual.rst
@@ -3812,7 +3812,11 @@ Changes
* Play formEditor.sql.
- * Dropdownlist of container assigment: remove 'class' (always 'container') and insert 'type' ('pill', 'fiedlset', 'templategroup').
+ * Dropdownlist of container assignment:
+
+ * Display 'type' ('pill', 'fieldset', 'templategroup') instead of 'class' (always 'container').
+ * Display 'name' (internal name) instead of 'label' (shown on the website and might not so usefull as 'name' which is nowhere else used than in that dropdown.
+
* FormElement.placeholder colum width extended to 512:
ALTER TABLE `FormElement` CHANGE `placeholder` `placeholder` VARCHAR(512) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '';
diff --git a/extension/qfq/sql/formEditor.sql b/extension/qfq/sql/formEditor.sql
index 3269b01c3..dfd383b6c 100644
--- a/extension/qfq/sql/formEditor.sql
+++ b/extension/qfq/sql/formEditor.sql
@@ -212,7 +212,7 @@ VALUES
''),
(2, 'formId', 'formId', 'readonly', 'text', 'all', 'native', 110, 0, 255, '', '', '', '', '', 100, '', 'no', '', '', '', '', ''),
(2, 'feIdContainer', 'Container', 'show', 'select', 'all', 'native', 120, 0, 0, '', '', '',
- '{{!SELECT fe.id, CONCAT(fe.type, " / ", fe.label) FROM FormElement As fe WHERE fe.formId={{formId:S0}} AND fe.class="container" ORDER BY fe.type, fe.name }}',
+ '{{!SELECT fe.id, CONCAT(fe.type, " / ", fe.name) FROM FormElement As fe WHERE fe.formId={{formId:S0}} AND fe.class="container" ORDER BY fe.type, fe.name }}',
'emptyItemAtStart', 100, '', 'no', '', '', '', '', ''),
(2, 'enabled', 'Enabled', 'show', 'checkbox', 'all', 'native', 130, 0, 0, '', '', '', '', '', 100, '', 'no', '', '', '', '', ''),
(2, 'dynamicUpdate', 'Dynamic Update', 'show', 'checkbox', 'all', 'native', 135, 0, 0, 'On change, this element will be updated and trigger other.',
--
GitLab