From af621f5d478e64b230f670639b77e5e9d09ebd32 Mon Sep 17 00:00:00 2001
From: Carsten Rose <carsten.rose@math.uzh.ch>
Date: Fri, 4 May 2018 08:32:52 +0200
Subject: [PATCH] Bug #5905: Multi DB: confusion with 'indexQfq' / 'indexData'
- with or without 'db'
---
extension/Documentation/Manual.rst | 55 ++----------------------------
extension/ext_conf_template.txt | 4 +--
2 files changed, 4 insertions(+), 55 deletions(-)
diff --git a/extension/Documentation/Manual.rst b/extension/Documentation/Manual.rst
index 74f0d4115..e81afa316 100644
--- a/extension/Documentation/Manual.rst
+++ b/extension/Documentation/Manual.rst
@@ -1553,59 +1553,8 @@ Store: *SYSTEM* - Y
* Sanitized: *no*
- +-------------------------+--------------------------------------------------------------------------+
- | Name | Explanation |
- +=========================+==========================================================================+
- | DB_USER | defined in configuration_ |
- +-------------------------+--------------------------------------------------------------------------+
- | DB_SERVER | defined in configuration_ |
- +-------------------------+--------------------------------------------------------------------------+
- | DB_NAME | defined in configuration_ |
- +-------------------------+--------------------------------------------------------------------------+
- | init | defined in configuration_ |
- +-------------------------+--------------------------------------------------------------------------+
- | sqlLog | defined in configuration_, see `SQL_LOG`_ |
- +-------------------------+--------------------------------------------------------------------------+
- | sqlLogMode | defined in configuration_, `SQL_LOG_MODE`_ |
- +-------------------------+--------------------------------------------------------------------------+
- | showDebugInfo | defined in configuration_ |
- +-------------------------+--------------------------------------------------------------------------+
- | cssClassQfqContainer | defined in configuration_ |
- +-------------------------+--------------------------------------------------------------------------+
- | EXT_PATH | computed during runtime |
- +-------------------------+--------------------------------------------------------------------------+
- | SITE_PATH | computed during runtime |
- +-------------------------+--------------------------------------------------------------------------+
- | dateFormat | defined in configuration_ |
- +-------------------------+--------------------------------------------------------------------------+
- | class | defined in configuration_ (CSS_CLASS_QFQ_FORM) or form definition |
- +-------------------------+--------------------------------------------------------------------------+
- | classPill | defined in configuration_ (CSS_CLASS_QFQ_FORM_PILL) or form definition |
- +-------------------------+--------------------------------------------------------------------------+
- | classBody | defined in configuration_ (CSS_CLASS_QFQ_FORM_BODY) or form definition |
- +-------------------------+--------------------------------------------------------------------------+
- | data-pattern-error | defined in configuration_ or form definition |
- +-------------------------+--------------------------------------------------------------------------+
- | data-require-error | defined in configuration_ or form definition |
- +-------------------------+--------------------------------------------------------------------------+
- | data-match-error | defined in configuration_ or form definition |
- +-------------------------+--------------------------------------------------------------------------+
- | data-error | defined in configuration_ or form definition |
- +-------------------------+--------------------------------------------------------------------------+
- | bsColumns | defined in configuration_ (FORM_BS_COLUMNS) or form definition |
- +-------------------------+--------------------------------------------------------------------------+
- | bsLabelColumns | defined in configuration_ (FORM_BS_LABEL_COLUMNS) or form definition |
- +-------------------------+--------------------------------------------------------------------------+
- | bsInputColumns | defined in configuration_ (FORM_BS_INPUT_COLUMNS) or form definition |
- +-------------------------+--------------------------------------------------------------------------+
- | bsNoteColumns | defined in configuration_ (FORM_BS_NOTE_COLUMNS) or form definition |
- +-------------------------+--------------------------------------------------------------------------+
- | sqlFinal | computed during runtime, used for error reporting |
- +-------------------------+--------------------------------------------------------------------------+
- | sqlParamArray | computed during runtime, used for error reporting |
- +-------------------------+--------------------------------------------------------------------------+
- | sqlCount | computed during runtime, used for error reporting |
- +-------------------------+--------------------------------------------------------------------------+
+See configuration_ for a list of all settings.
+
.. _LDAP:
diff --git a/extension/ext_conf_template.txt b/extension/ext_conf_template.txt
index 0eee3072d..eb6234e81 100644
--- a/extension/ext_conf_template.txt
+++ b/extension/ext_conf_template.txt
@@ -71,10 +71,10 @@ init = set names utf8
update = auto
# cat=database/db; type=string; label=Database index for QFQ data:Default is '1'. Retrieve the current setting via {{_dbNameData:Y}}
-dbIndexData = 1
+indexData = 1
# cat=database/db; type=string; label=Database index for QFQ system:Default is '1'. Retrieve the current setting via {{_dbNameQfq:Y}}
-dbIndexQfq = 1
+indexQfq = 1
--
GitLab