Skip to content
Snippets Groups Projects
Commit 24004ee2 authored by Jared Hancock's avatar Jared Hancock
Browse files

oops: Allow multiple new fields with no `name`

parent 1c866641
No related branches found
No related tags found
No related merge requests found
...@@ -36,7 +36,7 @@ if($_POST) { ...@@ -36,7 +36,7 @@ if($_POST) {
if (isset($_POST["type-$id"]) && $field->isChangeable()) if (isset($_POST["type-$id"]) && $field->isChangeable())
$field->set('type', $_POST["type-$id"]); $field->set('type', $_POST["type-$id"]);
if (isset($_POST["name-$id"]) && !$field->isNameForced()) if (isset($_POST["name-$id"]) && !$field->isNameForced())
$field->set('name', $_POST["name-$id"]); $field->set('name', trim($_POST["name-$id"]));
# TODO: make sure all help topics still have all required fields # TODO: make sure all help topics still have all required fields
$field->setRequirementMode($_POST["visibility-$id"]); $field->setRequirementMode($_POST["visibility-$id"]);
...@@ -110,7 +110,7 @@ if($_POST) { ...@@ -110,7 +110,7 @@ if($_POST) {
'sort'=>$_POST["sort-new-$i"] ? $_POST["sort-new-$i"] : ++$max_sort, 'sort'=>$_POST["sort-new-$i"] ? $_POST["sort-new-$i"] : ++$max_sort,
'label'=>$_POST["label-new-$i"], 'label'=>$_POST["label-new-$i"],
'type'=>$_POST["type-new-$i"], 'type'=>$_POST["type-new-$i"],
'name'=>$_POST["name-new-$i"], 'name'=>trim($_POST["name-new-$i"]),
)); ));
$field->setRequirementMode($_POST["visibility-new-$i"]); $field->setRequirementMode($_POST["visibility-new-$i"]);
$field->setForm($form); $field->setForm($form);
...@@ -118,7 +118,8 @@ if($_POST) { ...@@ -118,7 +118,8 @@ if($_POST) {
$field->addError(__('Field variable name is not unique'), 'name'); $field->addError(__('Field variable name is not unique'), 'name');
if ($field->isValid()) { if ($field->isValid()) {
$form_fields[] = $field; $form_fields[] = $field;
$names[] = $field->get('name'); if ($N = $field->get('name'))
$names[] = $N;
} }
else else
$errors["new-$i"] = $field->errors(); $errors["new-$i"] = $field->errors();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment