Bug #5924 / config.qfq.ini/LocalConfiguration.php: der FormEditor nur mit...

Bug #5924 / config.qfq.ini/LocalConfiguration.php: der FormEditor nur mit 'dbIndexData = 1' in config.qfq.ini - several places in formEditor.sql still contained the 'dbIndex...' instead of 'index...'. fixed.

extension/qfq/qfq/Constants.php

@@ -394,8 +394,8 @@ const SYSTEM_DB_INIT = 'init';
 const SYSTEM_DB_INDEX_DATA = "indexData";
 const SYSTEM_DB_INDEX_QFQ = "indexQfq";
 
-const SYSTEM_DB_INDEX_DATA_DEPRECATED = "DB_INDEX_DATA";
-const SYSTEM_DB_INDEX_QFQ_DEPRECATED = "DB_INDEX_QFQ";
+//const SYSTEM_DB_INDEX_DATA_DEPRECATED = "DB_INDEX_DATA";
+//const SYSTEM_DB_INDEX_QFQ_DEPRECATED = "DB_INDEX_QFQ";
 
 // Computed dynamically
 const SYSTEM_DB_NAME_DATA = '_dbNameData';

extension/qfq/qfq/store/Config.php

@@ -316,8 +316,8 @@ class Config {
         ];
 
         // To let run legacy code
-        $config[SYSTEM_DB_INDEX_DATA_DEPRECATED] = $config[SYSTEM_DB_INDEX_DATA];
-        $config[SYSTEM_DB_INDEX_QFQ_DEPRECATED] = $config[SYSTEM_DB_INDEX_QFQ];
+//        $config[SYSTEM_DB_INDEX_DATA_DEPRECATED] = $config[SYSTEM_DB_INDEX_DATA];
+//        $config[SYSTEM_DB_INDEX_QFQ_DEPRECATED] = $config[SYSTEM_DB_INDEX_QFQ];
 
         return array_merge($default, $config);
     }

extension/qfq/sql/formEditor.sql

@@ -162,7 +162,7 @@ WHERE FIND_IN_SET(Form.name, 'form,formElement,copyForm,cron') > 0;
 INSERT INTO Form (id, name, title, noteInternal, tableName, permitNew, permitEdit, render, multiSql, parameter) VALUES
   (1, 'form', 'Form Editor: {{SELECT id, " / ", name FROM Form WHERE id = {{r:S0}}}} (DB: {{_dbNameQfq:Y}})',
    'FormElement Editor',
-   'Form', 'sip', 'sip', 'bootstrap', '', 'maxVisiblePill=5\nclass=container-fluid\ndbIndex={{dbIndexQfq:Y}}');
+   'Form', 'sip', 'sip', 'bootstrap', '', 'maxVisiblePill=5\nclass=container-fluid\ndbIndex={{indexQfq:Y}}');
 
 # FormEditor: FormElements for 'form'
 INSERT INTO FormElement (id, formId, name, label, mode, type, checkType, class, ord, size, note, clientJs, value,
@@ -185,7 +185,7 @@ VALUES
    1, '', '', '', 'specialchar', 'no', '[a-zA-Z0-9._+-]+'),
   (1, 'title', 'Title', 'show', 'text', 'all', 'native', 130, 0, 0, '<a href="{{documentation:Y}}#form-title">Info</a>', '', '', '', '', 1, '', '', '', 'none', 'no', ''),
   (1, 'noteInternal', 'Note', 'show', 'text', 'all', 'native', 140, '40,3', 0, '<a href="{{documentation:Y}}#form-note">Info</a>', '', '', '', '', 1, '', '', '', 'specialchar', 'no', ''),
-  (1, 'tableName', 'Table', 'required', 'select', 'all', 'native', 150, 0, 0, '<a href="{{documentation:Y}}#form-tablename">Info</a>', '', '', '{{[{{dbIndexData:Y}}]!SHOW tables}}',
+  (1, 'tableName', 'Table', 'required', 'select', 'all', 'native', 150, 0, 0, '<a href="{{documentation:Y}}#form-tablename">Info</a>', '', '', '{{[{{indexData:Y}}]!SHOW tables}}',
    'emptyItemAtStart', 1, '', '', '', 'specialchar', 'no', ''),
   (1, 'parameterLanguageA', 'Language: {{formLanguageALabel:YE}}', 'show', 'text', 'all', 'native', 160, '60,2', 0,
    '<a href="{{documentation:Y}}#multi-language-form">Info</a>', '', '', '', '', 1, '', '{{SELECT IF("{{formLanguageAId:YE}}"="","hidden","show" ) }}', '', 'none', 'no', ''),
@@ -241,7 +241,7 @@ VALUES
    'Form Element Editor. Form : {{SELECT f.id, " / ",  f.name  FROM Form AS f WHERE f.id = {{formId:S0}}  }} (DB: {{_dbNameQfq:Y}})',
    'Please secure the form',
    'FormElement', 'sip', 'sip', 'bootstrap', '',
-   'maxVisiblePill=5\nclassBody=qfq-color-blue-1\ndbIndex={{dbIndexQfq:Y}}', 'formId');
+   'maxVisiblePill=5\nclassBody=qfq-color-blue-1\ndbIndex={{indexQfq:Y}}', 'formId');
 
 # FormEditor: FormElements for 'formElement'
 INSERT INTO FormElement (id, formId, name, label, mode, type, checkType, class, ord, size, note, clientJs, value,
@@ -270,7 +270,7 @@ VALUES
   (2, 'dynamicUpdate', 'Dynamic Update', 'show', 'checkbox', 'all', 'native', 135, 0, 0, '<a href="{{documentation:Y}}#dynamic-update">Info</a>',
    '', '', '', '', 100, '', 'no', '', '', '', '', '', 'specialchar'),
   (2, 'name', 'Name', 'show', 'text', 'all', 'native', 140, 0, 0, '<a href="{{documentation:Y}}#class-native">Info</a>', '', '', '',
-   'typeAheadSql = [{{dbIndexData:Y}}]SELECT COLUMN_NAME FROM information_schema.columns WHERE table_schema = "{{DB_1_NAME:Y}}" AND table_name = "{{SELECT f.tableName FROM Form AS f WHERE f.id={{formId:S0}}}}" AND COLUMN_NAME LIKE ? ORDER BY COLUMN_NAME\ntypeAheadMinLength = 1\ntypeAheadLimit = 100\ntypeAheadPedantic = 0\n',
+   'typeAheadSql = [{{indexData:Y}}]SELECT COLUMN_NAME FROM information_schema.columns WHERE table_schema = "{{DB_1_NAME:Y}}" AND table_name = "{{SELECT f.tableName FROM Form AS f WHERE f.id={{formId:S0}}}}" AND COLUMN_NAME LIKE ? ORDER BY COLUMN_NAME\ntypeAheadMinLength = 1\ntypeAheadLimit = 100\ntypeAheadPedantic = 0\n',
    100, '<a href="{{documentation:Y}}#class-native">Info</a>', 'no', '', '', '', '', '', 'specialchar'),
   (2, 'label', 'Label', 'show', 'text', 'all', 'native', 150, 0, 0, '<a href="{{documentation:Y}}#class-native">Info</a>', '', '', '', '', 100, '', 'no', '', '', '', '', '', 'none'),
   (2, 'mode', 'Mode', 'show', 'radio', 'all', 'native', 160, 0, 0, '<a href="{{documentation:Y}}#class-native">Info</a>', '', '', '', 'buttonClass=btn-default', 100, '', 'no', '', '', '', '', '', 'specialchar'),
@@ -424,7 +424,7 @@ CREATE TABLE IF NOT EXISTS `Cron` (
 # Form: AutoCron
 INSERT INTO Form (id, name, title, tableName, parameter, dirtyMode)
 VALUES
-  (4, 'cron', 'cron {{SELECT IF("{{r}}" = "0", "(new)", "(Id: {{r}})") }}', 'Cron', 'dbIndex={{dbIndexQfq:Y}}',
+  (4, 'cron', 'cron {{SELECT IF("{{r}}" = "0", "(new)", "(Id: {{r}})") }}', 'Cron', 'dbIndex={{indexQfq:Y}}',
    'none');
 
 # FormElements: AutoCron