Commit e839c90d authored by Rafael Ostertag's avatar Rafael Ostertag
Browse files

Merge remote-tracking branch 'origin/crose_work' into raos_work

parents f0c9e1b4 6d7b5dc4
......@@ -757,7 +757,7 @@ abstract class AbstractBuildForm {
throw new CodeException("Invalid (none or to small) Formelement", ERROR_MISSING_FORMELEMENT);
// Call getItemsForEnumOrSet() only if there a corresponding column really exist.
if (false !== $this->store->getVar($formElement['name'], STORE_RECORD)) {
if (false !== $this->store->getVar($formElement['name'], STORE_TABLE_COLUMN_TYPES)) {
$itemValue = $this->getItemsForEnumOrSet($formElement['name'], $fieldType);
}
......
......@@ -234,7 +234,8 @@ INSERT INTO FormElement (id, formId, name, label, mode, type, checkType, class,
VALUES
(200, 3, 'name', 'Name', 'show', 'text', 'all', 'native', 10, 50, 255, '', '', '', '', '', '', 0, ''),
(201, 3, 'firstname', 'Firstname', 'show', 'text', 'all', 'native', 10, 50, 255, '', '', '', '', '', '', 0, '');
(201, 3, 'firstname', 'Firstname', 'show', 'text', 'all', 'native', 20, 50, 255, '', '', '', '', '', '', 0, ''),
(202, 3, 'birthday', 'Birthday', 'show', 'dateJQW', 'all', 'native', 30, 50, 255, '', '', '', '', '', '', 0, '');
# ----------------------------------------------------------------------
#
......
......@@ -4,7 +4,8 @@ CREATE TABLE Person (
name VARCHAR(128),
firstname VARCHAR(128),
gender ENUM('', 'male', 'female') NOT NULL DEFAULT 'male',
groups SET('', 'a', 'b', 'c') NOT NULL DEFAULT ''
groups SET('', 'a', 'b', 'c') NOT NULL DEFAULT '',
birthday DATE NOT NULL DEFAULT '0000-00-00'
);
#
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment