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

API Report::get_reports() returns native array (fixes #8096) 

Used to return ArrayList, but since 9d74c99e08 its no
longer using keys, which they functionality using these return
values rely on. Hence the breakage of ReportAdmin,
since no report was being detected as "current" by looking
through the array keys.
This commit is contained in:
Ingo Schommer 2012-12-13 00:46:17 +01:00
parent f4128a0839
commit 2e164eae51
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
code/reports/Report.php
View File

@ -163,7 +163,7 @@ class SS_Report extends ViewableData {
/**
* Return the SS_Report objects making up the given list.
* @return ArrayList an arraylist of SS_Report objects
* @return Array of SS_Report objects
*/
static public function get_reports() {
$reports = ClassInfo::subclassesFor(get_called_class());
@ -182,13 +182,12 @@ class SS_Report extends ViewableData {
}
}
//convert array into ArrayList
$list = ArrayList::create($reportsArray);
uasort($reportsArray, function($a, $b) {
if($a->sort == $b->sort) return 0;
else return ($a->sort < $b->sort) ? -1 : 1;
});
//sort
$list = $list->sort('sort');
return $list;
return $reportsArray;
}
/////////////////////// UI METHODS ///////////////////////