tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-06-29 16:09:40 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX: Fixed DataList operations to respect the fact that they're idempotent.

Browse Source
This commit is contained in:
Sam Minnee 2012-06-15 15:30:08 +12:00
parent c051b80b73
commit 792c9058fa
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
code/controllers/AssetAdmin.php
View File

@ -102,7 +102,7 @@ JS
// Re-add previously removed "Name" filter as combined filter // Re-add previously removed "Name" filter as combined filter
// TODO Replace with composite SearchFilter once that API exists // TODO Replace with composite SearchFilter once that API exists
if(isset($params['Name'])) { if(isset($params['Name'])) {
$list->where(sprintf( $list = $list->where(sprintf(
'"Name" LIKE \'%%%s%%\' OR "Title" LIKE \'%%%s%%\'', '"Name" LIKE \'%%%s%%\' OR "Title" LIKE \'%%%s%%\'',
Convert::raw2sql($params['Name']), Convert::raw2sql($params['Name']),
Convert::raw2sql($params['Name']) Convert::raw2sql($params['Name'])
@ -110,12 +110,12 @@ JS
} }
// Always show folders at the top // Always show folders at the top
$list->sort('(CASE WHEN "File"."ClassName" = \'Folder\' THEN 0 ELSE 1 END), "Name"'); $list = $list->sort('(CASE WHEN "File"."ClassName" = \'Folder\' THEN 0 ELSE 1 END), "Name"');
// If a search is conducted, check for the "current folder" limitation. // If a search is conducted, check for the "current folder" limitation.
// Otherwise limit by the current folder as denoted by the URL. // Otherwise limit by the current folder as denoted by the URL.
if(!$params || @$params['CurrentFolderOnly']) { if(!$params || @$params['CurrentFolderOnly']) {
$list->filter('ParentID', $folder->ID); $list = $list->filter('ParentID', $folder->ID);
} }
// Category filter // Category filter
@ -124,7 +124,7 @@ JS
$categorySQLs = array(); $categorySQLs = array();
foreach($exts as $ext) $categorySQLs[] = '"File"."Name" LIKE \'%.' . $ext . '\''; foreach($exts as $ext) $categorySQLs[] = '"File"."Name" LIKE \'%.' . $ext . '\'';
// TODO Use DataList->filterAny() once OR connectives are implemented properly // TODO Use DataList->filterAny() once OR connectives are implemented properly
$list->where('(' . implode(' OR ', $categorySQLs) . ')'); $list = $list->where('(' . implode(' OR ', $categorySQLs) . ')');
} }
return $list; return $list;

6
code/controllers/CMSMain.php
View File

@ -477,7 +477,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
))); )));
} }
$result->sort('AddAction'); $result = $result->sort('AddAction');
return $result; return $result;
} }
@ -658,9 +658,9 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
foreach($pages=$filter->pagesIncluded() as $pageMap){ foreach($pages=$filter->pagesIncluded() as $pageMap){
$ids[] = $pageMap['ID']; $ids[] = $pageMap['ID'];
} }
if(count($ids)) $list->where('"'.$this->stat('tree_class').'"."ID" IN ('.implode(",", $ids).')'); if(count($ids)) $list = $list->where('"'.$this->stat('tree_class').'"."ID" IN ('.implode(",", $ids).')');
} else { } else {
$list->filter("ParentID", is_numeric($parentID) ? $parentID : 0); $list = $list->filter("ParentID", is_numeric($parentID) ? $parentID : 0);
} }
return $list; return $list;

2
code/reports/BrokenLinksReport.php
View File

@ -69,7 +69,7 @@ class BrokenLinksReport extends SS_Report {
} }
} }
if($sortBrokenReason) $returnSet->sort('BrokenReason', $direction); if($sortBrokenReason) $returnSet = $returnSet->sort('BrokenReason', $direction);
return $returnSet; return $returnSet;
} }

2
code/reports/Report.php
View File

@ -206,7 +206,7 @@ class SS_Report extends ViewableData {
$list = ArrayList::create($reportsArray); $list = ArrayList::create($reportsArray);
//sort //sort
$list->sort('sort'); $list = $list->sort('sort');
return $list; return $list;
} }