diff --git a/extension/Classes/Core/Constants.php b/extension/Classes/Core/Constants.php index 5f4f2e5c5b7321148c89eac2c7ec74ebdd855275..1bd762563ab3f009590297be8fb474d39f0f5bed 100644 --- a/extension/Classes/Core/Constants.php +++ b/extension/Classes/Core/Constants.php @@ -1230,6 +1230,8 @@ const CLIENT_REST_FORM = '_form'; const F_REMEMBER_LAST_PILL = SYSTEM_REMEMBER_LAST_PILL; const F_DO_NOT_LOG_COLUMN = SYSTEM_DO_NOT_LOG_COLUMN; +const F_LOCK_SAME_OWNER = SYSTEM_LOCK_SAME_OWNER; + const F_UNEVALUATED_TITLE = 'unevaluatedTitle'; // Form Columns: Only in form file diff --git a/extension/Classes/Core/QuickFormQuery.php b/extension/Classes/Core/QuickFormQuery.php index 0c89d7571a11223d7588d6427b9fa8789138f5e0..3c0fa86410d1fee17c1468257916be479b4fcf33 100644 --- a/extension/Classes/Core/QuickFormQuery.php +++ b/extension/Classes/Core/QuickFormQuery.php @@ -1599,8 +1599,8 @@ class QuickFormQuery { F_DO_NOT_LOG_COLUMN, FE_FILE_MAX_FILE_SIZE, - F_FE_DATA_PATTERN_ERROR_SYSTEM, // Not a classical element to overwrite by form definition, but should be copied to detect changes per custom setting. + F_LOCK_SAME_OWNER, ]; // By definition: existing vars which are empty, means: EMPTY - do not use any default! diff --git a/extension/ext_conf_template.txt b/extension/ext_conf_template.txt index ad1aa082aacf1ff073e1d8de1d204cd25fc336f6..0f6cdbe9d41c16ddde43830edff3d16283f96436 100644 --- a/extension/ext_conf_template.txt +++ b/extension/ext_conf_template.txt @@ -10,9 +10,6 @@ baseUrl = # cat=config/date; type=string; label=Date format:Default is 'dd.mm.yyyy'. Possible options: 'yyyy-mm-dd', 'dd.mm.yyyy' dateFormat = dd.mm.yyyy -# cat=form-config/config; type=boolean; label=Lock Same Owner:Options: a) 'true' (default): The user needs to wait for the "Dirty Record Lock" to expire or delete the dirty record directly in the database. b) 'false': The "Dirty Record Lock" can be removed when triggered by the same user. -lockSameOwner = true - # cat=config/config; type=boolean; label=Show edit inline reports. In the frontend, for every QFQ Report record an edit symbol is shown. Click on it will open a window to edit the QFQ report. editInlineReports = 1 @@ -136,6 +133,8 @@ encryptionMethod = protectedFolderCheck = 1 +# cat=form-config/config; type=boolean; label=Protect against multiple edits by the same user +lockSameOwner = 0 # cat=form-config/config; type=string; label=Dirty record lock timeout (seconds):Default is '900'. Time in seconds to lock a record, starting from the first modification. If lock expires, it is acquired again on the next modification. recordLockTimeoutSeconds = 900