tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-01 05:39:10 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.0'

Browse Source
This commit is contained in:
Ingo Schommer 2012-08-09 12:47:26 +02:00
commit b69813af9f
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
forms/gridfield/GridFieldAddExistingAutocompleter.php
View File

@ -172,14 +172,8 @@ class GridFieldAddExistingAutocompleter implements GridField_HTMLProvider, GridF
* @param SS_HTTPRequest $request * @param SS_HTTPRequest $request
*/ */
public function doSearch($gridField, $request) { public function doSearch($gridField, $request) {
if($this->searchList) { $dataClass = $gridField->getList()->dataClass();
$allList = $this->searchList; $allList = $this->searchList ? $this->searchList : DataList::create($dataClass);
} else {
$allList = DataList::create($gridField->getList()->dataClass());
}
$filters = array();
$stmts = array();
$searchFields = ($this->getSearchFields()) ? $this->getSearchFields() : $this->scaffoldSearchFields($dataClass); $searchFields = ($this->getSearchFields()) ? $this->getSearchFields() : $this->scaffoldSearchFields($dataClass);
if(!$searchFields) { if(!$searchFields) {
@ -189,6 +183,7 @@ class GridFieldAddExistingAutocompleter implements GridField_HTMLProvider, GridF
} }
// TODO Replace with DataList->filterAny() once it correctly supports OR connectives // TODO Replace with DataList->filterAny() once it correctly supports OR connectives
$stmts = array();
foreach($searchFields as $searchField) { foreach($searchFields as $searchField) {
$stmts[] .= sprintf('"%s" LIKE \'%s%%\'', $searchField, Convert::raw2sql($request->getVar('gridfield_relationsearch'))); $stmts[] .= sprintf('"%s" LIKE \'%s%%\'', $searchField, Convert::raw2sql($request->getVar('gridfield_relationsearch')));
} }

8
i18n/i18nTextCollector.php
View File

@ -328,6 +328,14 @@ class i18nTextCollector extends Object {
*/ */
function collectFromEntityProviders($filePath, $module = null) { function collectFromEntityProviders($filePath, $module = null) {
$entities = array(); $entities = array();
// HACK Ugly workaround to avoid "Cannot redeclare class PHPUnit_Framework_TestResult" error
// when running text collector with PHPUnit 3.4. There really shouldn't be any dependencies
// here, but the class reflection enforces autloading of seemingly unrelated classes.
// The main problem here is the CMSMenu class, which iterates through test classes,
// which in turn trigger autoloading of PHPUnit.
$phpunitwrapper = PhpUnitWrapper::inst();
$phpunitwrapper->init();
$classes = ClassInfo::classes_for_file($filePath); $classes = ClassInfo::classes_for_file($filePath);
if($classes) foreach($classes as $class) { if($classes) foreach($classes as $class) {