tonyair/silverstripe-reports
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-reports synced 2024-09-30 05:09:11 +02:00
Code Issues Projects Releases Wiki Activity

ENHANCEMENT: CMS Editor Upload panel now loads the root files directly and allows the user to upload to the root assets dir

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97601 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Will Rossiter 2010-01-26 20:53:55 +00:00 committed by Sam Minnee
parent 16f9491f94
commit 5a071b4ef6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
code/ThumbnailStripField.php
View File

@ -49,15 +49,15 @@ class ThumbnailStripField extends FormField {
$whereSQL = '"ParentID" IN (' . implode(', ', $folderList) . ')';
if($searchText) $whereSQL .= " AND \"Filename\" LIKE '%$searchText%'";
$images = DataObject::get('Image', $whereSQL, 'Title');
} else {
$whereSQL = "\"ParentID\" = 0";
if($searchText) {
$whereSQL = "\"Filename\" LIKE '%$searchText%'";
$images = DataObject::get('Image', $whereSQL, 'Title');
$whereSQL = " AND \"Filename\" LIKE '%$searchText%'";
}
$images = DataObject::get('Image', $whereSQL, 'Title');
}
if($images) {