tonyair/silverstripe-tagfield
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-tagfield synced 2024-10-22 11:05:32 +02:00
Code Issues Projects Releases Wiki Activity

Updated TagField to work with numeric tags

Browse Source
This commit is contained in:
Myles Beardsmore 2016-02-04 12:08:34 +13:00
parent d7ca8caa83
commit 76c10d8df2
1 changed files with 51 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
code/TagField.php
View File

@ -200,7 +200,7 @@ class TagField extends DropdownField
$source = $this->getSource();
if (!$source) {
if(!$source) {
$source = new ArrayList();
}
@ -208,31 +208,30 @@ class TagField extends DropdownField
$values = $this->Value();
// Mark selected tags while still returning a full list of possible options
$ids = array(); // empty fallback array for comparing
$values = $this->Value();
if($values){
// @TODO conversion from array to DataList to array...(?)
if(is_array($values)) {
$values = DataList::create($dataClass)->filter('ID', $values);
}
$ids = $values->column('ID');
if(!$values) {
return $options;
}
if(is_array($values)) {
$values = DataList::create($dataClass)->filter('Title', $values);
}
$ids = $values->column('Title');
$titleField = $this->getTitleField();
foreach ($source as $object) {
foreach($source as $object) {
$options->push(
ArrayData::create(array(
'Title' => $object->$titleField,
'Value' => $object->ID,
'Selected' => in_array($object->ID, $ids),
ArrayData::create(array(
'Title' => $object->$titleField,
'Value' => $object->Title,
'Selected' => in_array($object->Title, $ids),
))
);
}
return $options;
}
}
/**
* {@inheritdoc}
@ -243,10 +242,10 @@ class TagField extends DropdownField
$name = $this->getName();
if ($source->hasMethod($name)) {
$value = $source->$name()->getIDList();
$value = $source->$name()->column('Title');
}
} elseif ($value instanceof SS_List) {
$value = $value->column('ID');
$value = $value->column('Title');
}
if (!is_array($value)) {
@ -275,45 +274,43 @@ class TagField extends DropdownField
parent::saveInto($record);
$name = $this->getName();
$titleField = $this->getTitleField();
$source = $this->getSource();
$values = $this->Value();
if (!$values) {
$relation = $record->$name();
$ids = array();
if(!$values) {
$values = array();
}
if (empty($record) || empty($source) || empty($titleField)) {
if(empty($record) || empty($source) || empty($titleField)) {
return;
}
if (!$record->hasMethod($name)) {
if(!$record->hasMethod($name)) {
throw new Exception(
sprintf("%s does not have a %s method", get_class($record), $name)
);
}
$relation = $record->$name();
foreach ($values as $i => $value) {
if (!$this->getCanCreate()) {
unset($values[$i]);
continue;
}
foreach ($values as $key => $value) {
// Get or create record
$record = $this->getOrCreateTag($value);
$values[$i] = $record->ID;
if($record) {
$ids[] = $record->ID;
$values[$key] = $record->Title;
}
}
if ($values instanceof SS_List) {
$values = iterator_to_array($values);
}
$relation->setByIDList(array_filter($ids));
$relation->setByIDList(array_filter($values));
}
}
/**
* Get or create tag with the given value
@ -324,21 +321,25 @@ class TagField extends DropdownField
protected function getOrCreateTag($term)
{
// Check if existing record can be found
$source = $this->getSource();
$titleField = $this->getTitleField();
$record = $source
->filter($titleField, $term)
->first();
if ($record) {
return $record;
}
$source = $this->getSource();
$titleField = $this->getTitleField();
$record = $source
->filter($titleField, $term)
->first();
if($record) {
return $record;
}
// Create new instance if not yet saved
$dataClass = $source->dataClass();
$record = Injector::inst()->create($dataClass);
$record->{$titleField} = $term;
$record->write();
return $record;
// Create new instance if not yet saved
if ($this->getCanCreate()) {
$dataClass = $source->dataClass();
$record = Injector::inst()->create($dataClass);
$record->{$titleField} = $term;
$record->write();
return $record;
} else {
return false;
}
}
/**
@ -385,7 +386,7 @@ class TagField extends DropdownField
$titleField = $this->getTitleField();
foreach ($query->map('ID', $titleField) as $id => $title) {
$items[$title] = array(
'id' => $id,
'id' => $title,
'text' => $title
);
}