Commit bee3ac4b authored by Carsten  Rose's avatar Carsten Rose
Browse files

Redesing FormEditor: FormElement as second pill. Hide MultiForm as long as it...

Redesing FormEditor: FormElement as second pill. Hide MultiForm as long as it not active. Rename Various to Layout.
parent c0975d27
Pipeline #1327 passed with stage
in 2 minutes and 16 seconds
......@@ -1055,7 +1055,7 @@ abstract class AbstractBuildForm {
/**
* Set corresponding JSON attributes readonly/required/disabled, based on $formElement[FE_MODE].
*
* @param array $feMode
* @param string $feMode
*
* @return array
* @throws UserFormException
......
......@@ -779,7 +779,7 @@ EOF;
* @param string $htmlElement Content to wrap.
* @param string $wrapName FE_WRAP_ROW, FE_WRAP_LABEL, FE_WRAP_INPUT, FE_WRAP_NOTE
* @param int $bsColumns
* @param array $wrapArray Systemwide Defaults: [ 'open wrap', 'close wrap' ]
* @param array $wrapArray System wide Defaults: [ 'open wrap', 'close wrap' ]
* @param string $htmlId
* @param string $class
*
......
This diff is collapsed.
......@@ -303,16 +303,16 @@ class BuildFormPlainTest extends AbstractDatabaseTest {
unset($formElement[FE_EMPTY_ITEM_AT_START]);
// SQL (4 columns, none 'id' nor 'label') - Take the first two columns
$expectKeys = ['100', '400', '200'];
$expectValues = ['basic', 'access', 'various'];
$expectKeys = ['100', '200', '300'];
$expectValues = ['basic', 'formelement', 'layout'];
$formElement['sql1'] = $this->dbArray[DB_INDEX_DEFAULT]->sql('SELECT ord, name, created, modified FROM FormElement AS fe ORDER BY fe.id LIMIT 3');
$build->getKeyValueListFromSqlEnumSpec($formElement, $keys, $values);
$this->assertEquals($expectKeys, $keys);
$this->assertEquals($expectValues, $values);
// SQL (4 columns, none 'id', one 'label' ) - Take the first and the fourth two columns
$expectKeys = ['100', '400', '200'];
$expectValues = ['basic', 'access', 'various'];
$expectKeys = ['100', '200', '300'];
$expectValues = ['basic', 'formelement', 'layout'];
$formElement['sql1'] = $this->dbArray[DB_INDEX_DEFAULT]->sql('SELECT ord, created, modified, name AS label FROM FormElement AS fe ORDER BY fe.id LIMIT 3');
$build->getKeyValueListFromSqlEnumSpec($formElement, $keys, $values);
$this->assertEquals($expectKeys, $keys);
......@@ -320,7 +320,7 @@ class BuildFormPlainTest extends AbstractDatabaseTest {
// SQL (4 columns, none 'id', one 'label' ) - Take the first and the fourth two columns
$expectKeys = ['1', '2', '3'];
$expectValues = ['basic', 'access', 'various'];
$expectValues = ['basic', 'formelement', 'layout'];
$formElement['sql1'] = $this->dbArray[DB_INDEX_DEFAULT]->sql('SELECT ord, created, modified, name AS label, id FROM FormElement AS fe ORDER BY fe.id LIMIT 3');
$build->getKeyValueListFromSqlEnumSpec($formElement, $keys, $values);
$this->assertEquals($expectKeys, $keys);
......
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