mirror of
https://github.com/silverstripe/silverstripe-reports
synced 2024-10-22 11:05:53 +02:00
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:
parent
f4128a0839
commit
2e164eae51
@ -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 ///////////////////////
|
||||
|
Loading…
Reference in New Issue
Block a user