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

FIX Removing potentially breaking lower-case change (and fix tests)

This commit is contained in:
Guy Marriott 2019-07-24 15:55:08 +12:00
parent a1c57f664d
commit 61d3d04ed6
No known key found for this signature in database
GPG Key ID: A80F9ACCB86D3DA7
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/TagField.php
View File

@ -283,7 +283,7 @@ class TagField extends MultiSelectField
$option = $item->$titleField;
$options->push(ArrayData::create([
'Title' => $option,
'Value' => strtolower($option),
'Value' => $option,
'Selected' => (bool) $values->find('ID', $item->ID)
]));
};
@ -448,7 +448,7 @@ class TagField extends MultiSelectField
foreach ($query->map('ID', $titleField) as $id => $title) {
$items[$title] = [
'Title' => $title,
'Value' => strtolower($title),
'Value' => $title,
];
}

22
tests/TagFieldTest.php
View File

@ -181,7 +181,7 @@ class TagFieldTest extends SapphireTest
$request = $this->getNewRequest(['term' => 'Tag']);
$this->assertEquals(
'{"items":[{"id":"Tag1","text":"Tag1"}]}',
'{"items":[{"Title":"Tag1","Value":"Tag1"}]}',
$field->suggest($request)->getBody()
);
@ -191,7 +191,7 @@ class TagFieldTest extends SapphireTest
$request = $this->getNewRequest(['term' => '222']);
$this->assertEquals(
'{"items":[{"id":"222","text":"222"}]}',
'{"items":[{"Title":"222","Value":"222"}]}',
$field->suggest($request)->getBody()
);
@ -201,7 +201,7 @@ class TagFieldTest extends SapphireTest
$request = $this->getNewRequest(['term' => 'TAG1']);
$this->assertEquals(
'{"items":[{"id":"Tag1","text":"Tag1"}]}',
'{"items":[{"Title":"Tag1","Value":"Tag1"}]}',
$field->suggest($request)->getBody()
);
@ -230,7 +230,7 @@ class TagFieldTest extends SapphireTest
$request = $this->getNewRequest(['term' => 'Tag']);
$this->assertEquals(
'{"items":[{"id":"Tag1","text":"Tag1"}]}',
'{"items":[{"Title":"Tag1","Value":"Tag1"}]}',
$field->suggest($request)->getBody()
);
@ -240,7 +240,7 @@ class TagFieldTest extends SapphireTest
$request = $this->getNewRequest(['term' => 'Tag1']);
$this->assertEquals(
'{"items":[{"id":"Tag1","text":"Tag1"}]}',
'{"items":[{"Title":"Tag1","Value":"Tag1"}]}',
$field->suggest($request)->getBody()
);
@ -369,8 +369,16 @@ class TagFieldTest extends SapphireTest
$this->assertFalse($schema['lazyLoad']);
$this->assertFalse($schema['creatable']);
$this->assertEquals([
['Title' => 'Tag1', 'Value' => 'Tag1'],
['Title' => '222', 'Value' => '222'],
['Title' => 'Tag1', 'Value' => 'Tag1', 'Selected' => false],
['Title' => '222', 'Value' => '222', 'Selected' => false],
], $schema['options']);
$field->setValue(['222']);
$schema = $field->getSchemaDataDefaults();
$this->assertEquals([
['Title' => 'Tag1', 'Value' => 'Tag1', 'Selected' => false],
['Title' => '222', 'Value' => '222', 'Selected' => true],
], $schema['options']);
$field