tonyair
/
silverstripe-tagfield
mirror of https://github.com/silverstripe/silverstripe-tagfield
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #109 from jakxnz/master 

Set "title field" at a meaningful point in TagField instantiation
This commit is contained in:
Robbie Averill 2018-04-06 14:42:29 +12:00 committed by GitHub
parent 7691fc27c6 1e40d07a98
commit c836b7f914
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/TagField.php
View File

@ -65,10 +65,12 @@ class TagField extends DropdownField
* @param string $title
* @param null|DataList $source
* @param null|DataList $value
* @param string $titleField
*/
public function __construct($name, $title = '', $source = [], $value = null)
public function __construct($name, $title = '', $source = [], $value = null, $titleField = 'Title')
{
$this->setSourceList($source);
$this->setTitleField($titleField);
parent::__construct($name, $title, $source, $value);
}
@ -254,10 +256,10 @@ class TagField extends DropdownField
}
if (is_array($values)) {
$values = DataList::create($dataClass)->filter('Title', $values);
$values = DataList::create($dataClass)->filter($this->getTitleField(), $values);
}
$ids = $values->column('Title');
$ids = $values->column($this->getTitleField());
$titleField = $this->getTitleField();
@ -283,10 +285,10 @@ class TagField extends DropdownField
$name = $this->getName();
if ($source->hasMethod($name)) {
$value = $source->$name()->column('Title');
$value = $source->$name()->column($this->getTitleField());
}
} elseif ($value instanceof SS_List) {
$value = $value->column('Title');
$value = $value->column($this->getTitleField());
}
if (!is_array($value)) {