Skip to content

Commit

Permalink
fixed regression in list faceted links admin rendering.
Browse files Browse the repository at this point in the history
  • Loading branch information
pollen8 committed Apr 29, 2015
1 parent 8facc2d commit 7e2e121
Showing 1 changed file with 7 additions and 8 deletions.
Expand Up @@ -52,7 +52,6 @@ protected function getInput()
$listParams = $feListModel->getParams();
$formOrder = json_decode($listParams->get('faceted_form_order'));
$listOrder = json_decode($listParams->get('faceted_list_order'));
$form = $this->form;
$this->value = (array) $this->value;
$linkedLists = $this->getAttribute('linkedlist', array());
$linkedForms = $this->getAttribute('linkedform', array());
Expand All @@ -67,7 +66,7 @@ protected function getInput()
$formOrder = array_keys($linkedForms);
}

// Newly added releated elements
// Newly added related elements
foreach ($joins as $linkedList)
{
$key = $linkedList->list_id . '-' . $linkedList->form_id . '-' . $linkedList->element_id;
Expand All @@ -83,12 +82,12 @@ protected function getInput()
}
}

$listHeaders = $this->getAttribute('linkedlistheader', array());
$formHeaders = $this->getAttribute('linkedformheader', array());
$formLinkTypes = $this->getAttribute('linkedform_linktype', array());
$listLinkTypes = $this->getAttribute('linkedlist_linktype', array());
$listLinkTexts = $this->getAttribute('linkedlisttext', array());
$formLinkTexts = $this->getAttribute('linkedformtext', array());
$listHeaders = FArrayHelper::getValue($this->value, 'linkedlistheader', array());
$formHeaders = FArrayHelper::getValue($this->value, 'linkedformheader', array());
$formLinkTypes = FArrayHelper::getValue($this->value, 'linkedform_linktype', array());
$listLinkTypes = FArrayHelper::getValue($this->value, 'linkedlist_linktype', array());
$listLinkTexts = FArrayHelper::getValue($this->value, 'linkedlisttext', array());
$formLinkTexts = FArrayHelper::getValue($this->value, 'linkedformtext', array());

$this->linkedlists = array();
$f = 0;
Expand Down

1 comment on commit 7e2e121

@trob
Copy link

@trob trob commented on 7e2e121 Apr 29, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think FArrayHelper is still missing in lines 57/58

Please sign in to comment.