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

Merge branch '2.2'

This commit is contained in:
Robbie Averill 2019-02-19 11:21:23 +07:00
parent 44451775b3 daf71e2fab
commit d24400cbbd
4 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/boot/registerComponents.js
View File

@ -1,5 +1,5 @@
import Injector from 'lib/Injector'; import Injector from 'lib/Injector';
import TagField from 'components/TagField'; import TagField from '../components/TagField';
export default () => { export default () => {
Injector.component.registerMany({ Injector.component.registerMany({

1
package.json
View File

@ -65,6 +65,7 @@
"enzyme-adapter-react-15.4": "^1.0.5", "enzyme-adapter-react-15.4": "^1.0.5",
"html-loader": "^0.5.1", "html-loader": "^0.5.1",
"jest-cli": "^19.0.2", "jest-cli": "^19.0.2",
"react-addons-test-utils": "15.3.1",
"webpack": "^2" "webpack": "^2"
}, },
"dependencies": { "dependencies": {

12
src/StringTagField.php
View File

@ -269,10 +269,20 @@ class StringTagField extends DropdownField
$name = $this->getName(); $name = $this->getName();
$record->$name = implode(',', $this->Value()); $record->$name = $this->dataValue();
$record->write(); $record->write();
} }
/**
* Ensure that arrays are imploded before being saved
*
* @return mixed|string
*/
public function dataValue()
{
return implode(',', $this->value);
}
/** /**
* Returns a JSON string of tags, for lazy loading. * Returns a JSON string of tags, for lazy loading.
* *

4
yarn.lock
View File

@ -6651,6 +6651,10 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.2.7:
minimist "^1.2.0" minimist "^1.2.0"
strip-json-comments "~2.0.1" strip-json-comments "~2.0.1"
react-addons-test-utils@15.3.1:
version "15.3.1"
resolved "https://registry.yarnpkg.com/react-addons-test-utils/-/react-addons-test-utils-15.3.1.tgz#b3b64e15d7d85f6d190020dca641218684b1124d"
react-dom@15.3.1: react-dom@15.3.1:
version "15.3.1" version "15.3.1"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.3.1.tgz#6d42cd2b64c8c5e0b693f3ffaec301e6e627e24e" resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.3.1.tgz#6d42cd2b64c8c5e0b693f3ffaec301e6e627e24e"