From be3357b9d00c55c20ef5ce3d106d3f7fc86e6e80 Mon Sep 17 00:00:00 2001
From: Carsten Rose <carsten.rose@math.uzh.ch>
Date: Mon, 2 May 2016 15:36:39 +0200
Subject: [PATCH] Formelement.mode='lock': removed, cause it seems that there
is no difference to 'readonly'. Inside the code, there is no difference
UserManual/Index.rst: doc updated FillStoreForm.php, Save.php: same
functionality like FE_MODE_READONLY - removed. formEditor.sql: definition
updated
---
extension/Documentation/UsersManual/Index.rst | 8 ++++----
extension/qfq/qfq/Constants.php | 1 -
extension/qfq/qfq/Save.php | 10 ++++++++++
extension/qfq/qfq/store/FillStoreForm.php | 1 -
extension/qfq/sql/formEditor.sql | 8 ++++----
5 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/extension/Documentation/UsersManual/Index.rst b/extension/Documentation/UsersManual/Index.rst
index ee932088c..6e8d5871f 100644
--- a/extension/Documentation/UsersManual/Index.rst
+++ b/extension/Documentation/UsersManual/Index.rst
@@ -498,10 +498,10 @@ Class: Native
+---------------+-----------------------------+---------------------------------------------------------------------------------------------------+
|label | string | Label of formelement. Depending on layout model, left or on top of the formelement |
+---------------+-----------------------------+---------------------------------------------------------------------------------------------------+
-|mode | enum('show', 'readonly', | Default: show - *Show*: regular user input field. *Readonly* : user can't change any data. |
-| | 'required', 'lock', | *Important* : user manipulated data won't be saved. *Required* User has to specify a value. |
-| | 'disabled' ) | Typically, an <empty string> represents 'no value'. *Lock* form element is read only and grayed |
-| | | out, *Disabled*: form element is not visible |
+|mode | enum('show', 'readonly', | *Show*: regular user input field. This is the default. |
+| | 'required', | *Required*: User has to specify a value. Typically, an <empty string> represents 'no value'. |
+| | 'disabled' ) | *Readonly*: user can't change any data. Data not saved. |
+| | | *Disabled*: form element is not visible. |
+---------------+-----------------------------+---------------------------------------------------------------------------------------------------+
|class | enum('native', 'action', | Details below. |
| | 'container') | |
diff --git a/extension/qfq/qfq/Constants.php b/extension/qfq/qfq/Constants.php
index 84f3562ff..c5eb3e0ba 100644
--- a/extension/qfq/qfq/Constants.php
+++ b/extension/qfq/qfq/Constants.php
@@ -365,7 +365,6 @@ const GLYPH_ICON_CHECK = 'glyphicon glyphicon-ok';
const FE_MODE_SHOW = 'show';
const FE_MODE_READONLY = 'readonly';
const FE_MODE_REQUIRED = 'required';
-const FE_MODE_LOCK = 'lock';
const FE_MODE_DISABLED = 'disabled';
const FE_SUBRECORD_ROW_CLASS = '_rowClass';
diff --git a/extension/qfq/qfq/Save.php b/extension/qfq/qfq/Save.php
index 33b7fc3c5..d2bcbb5f3 100644
--- a/extension/qfq/qfq/Save.php
+++ b/extension/qfq/qfq/Save.php
@@ -97,6 +97,16 @@ class Save {
if ($formElement === false)
continue;
+ // Some modes means: do not save this column.
+ switch ($formElement[FE_MODE]) {
+ case FE_MODE_READONLY:
+ case FE_MODE_DISABLED:
+ continue 2; // 1 for switch, 2 for continue foreach.
+ default:
+ break;
+ }
+
+
// Preparation for Log, Debug
$this->store->setVar(SYSTEM_FORM_ELEMENT, Logger::formatFormElementName($formElement), STORE_SYSTEM);
diff --git a/extension/qfq/qfq/store/FillStoreForm.php b/extension/qfq/qfq/store/FillStoreForm.php
index 5c8ee5e70..72f3f7092 100644
--- a/extension/qfq/qfq/store/FillStoreForm.php
+++ b/extension/qfq/qfq/store/FillStoreForm.php
@@ -167,7 +167,6 @@ class FillStoreForm {
break;
case FE_MODE_READONLY:
- case FE_MODE_LOCK:
case FE_MODE_DISABLED:
continue;
default:
diff --git a/extension/qfq/sql/formEditor.sql b/extension/qfq/sql/formEditor.sql
index ed94c35ed..d796a85b5 100644
--- a/extension/qfq/sql/formEditor.sql
+++ b/extension/qfq/sql/formEditor.sql
@@ -63,7 +63,7 @@ CREATE TABLE IF NOT EXISTS `FormElement` (
`name` VARCHAR(255) NOT NULL DEFAULT '',
`label` VARCHAR(255) NOT NULL DEFAULT '',
- `mode` ENUM('show', 'readonly', 'required', 'lock', 'disabled') NOT NULL DEFAULT 'show',
+ `mode` ENUM('show', 'required', 'readonly', 'disabled') NOT NULL DEFAULT 'show',
`class` ENUM('native', 'action', 'container') NOT NULL DEFAULT 'native',
`type` ENUM('checkbox', 'date', 'datetime', 'dateJQW', 'datetimeJQW', 'gridJQW', 'hidden', 'text', 'time',
'note', 'password', 'radio', 'select', 'subrecord', 'upload', 'fieldset', 'pill',
@@ -81,9 +81,9 @@ CREATE TABLE IF NOT EXISTS `FormElement` (
`size` VARCHAR(255) NOT NULL DEFAULT '',
`maxLength` VARCHAR(255) NOT NULL DEFAULT '',
- `bsLabelColumns` VARCHAR(255) NOT NULL DEFAULT '',
- `bsInputColumns` VARCHAR(255) NOT NULL DEFAULT '',
- `bsNoteColumns` VARCHAR(255) NOT NULL DEFAULT '',
+ `bsLabelColumns` VARCHAR(255) NOT NULL DEFAULT '',
+ `bsInputColumns` VARCHAR(255) NOT NULL DEFAULT '',
+ `bsNoteColumns` VARCHAR(255) NOT NULL DEFAULT '',
`note` TEXT NOT NULL,
`tooltip` VARCHAR(255) NOT NULL DEFAULT '',
`placeholder` VARCHAR(255) NOT NULL DEFAULT '',
--
GitLab