Skip to content
Snippets Groups Projects
Commit fc1a56ea authored by Peter Rotich's avatar Peter Rotich
Browse files

bug: Consider list when looking up list item

List item are only unique within the list.
parent 9ee12a9a
No related branches found
No related tags found
No related merge requests found
......@@ -163,7 +163,8 @@ class DynamicFormsAjaxAPI extends AjaxController {
$item->extra = $basic['extra'];
$item->value = $basic['value'];
if ($_item = DynamicListItem::lookup(array('value'=>$item->value)))
if ($_item = DynamicListItem::lookup(array(
'list_id' => $list->getId(), 'value'=>$item->value)))
if ($_item && $_item->id != $item->id)
$item_form->getField('value')->addError(
__('Value already in use'));
......@@ -218,11 +219,12 @@ class DynamicFormsAjaxAPI extends AjaxController {
if ($_POST && ($valid = $item_form->isValid())) {
$data = $item_form->getClean();
if ($_item = DynamicListItem::lookup(array('value'=>$data['value'])))
if ($_item = DynamicListItem::lookup(array(
'list_id' => $list->getId(), 'value'=>$data['value'])))
if ($_item && $_item->id)
$item_form->getField('value')->addError(
__('Value already in use'));
$data['list_id'] = $list_id;
$data['list_id'] = $list->getId();
$item = DynamicListItem::create($data);
if ($item->save() && $item->setConfiguration())
Http::response(201, $this->encode(array('success' => true)));
......
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