mirror of
https://github.com/silverstripe/silverstripe-cms
synced 2024-10-22 08:05:56 +02:00
API CHANGE Changed name from DataObjectSet to either ArrayList or DataList
This commit is contained in:
parent
05e90838c0
commit
d799c80cc5
@ -31,7 +31,7 @@ class SilverStripeNavigator extends ViewableData {
|
||||
}
|
||||
|
||||
/**
|
||||
* @return DataObjectSet of SilverStripeNavigatorItem
|
||||
* @return SS_List of SilverStripeNavigatorItem
|
||||
*/
|
||||
function getItems() {
|
||||
$items = array();
|
||||
@ -59,7 +59,7 @@ class SilverStripeNavigator extends ViewableData {
|
||||
}
|
||||
ksort($items);
|
||||
|
||||
return new DataObjectSet($items);
|
||||
return new ArrayList($items);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -284,7 +284,7 @@ JS;
|
||||
* Populates an array of classes in the CMS
|
||||
* which allows the user to change the page type.
|
||||
*
|
||||
* @return DataObjectSet
|
||||
* @return SS_List
|
||||
*/
|
||||
public function PageTypes() {
|
||||
$classes = SiteTree::page_type_classes();
|
||||
|
@ -65,7 +65,7 @@ class ContentController extends Controller {
|
||||
* Return the children of a given page. The parent reference can either be a page link or an ID.
|
||||
*
|
||||
* @param string|int $parentRef
|
||||
* @return DataObjectSet
|
||||
* @return SS_List
|
||||
*/
|
||||
public function ChildrenOf($parentRef) {
|
||||
$parent = SiteTree::get_by_link($parentRef);
|
||||
@ -78,7 +78,7 @@ class ContentController extends Controller {
|
||||
}
|
||||
|
||||
/**
|
||||
* @return DataObjectSet
|
||||
* @return SS_List
|
||||
*/
|
||||
public function Page($link) {
|
||||
return SiteTree::get_by_link($link);
|
||||
@ -283,7 +283,7 @@ class ContentController extends Controller {
|
||||
|
||||
/**
|
||||
* Returns a fixed navigation menu of the given level.
|
||||
* @return DataObjectSet
|
||||
* @return SS_List
|
||||
*/
|
||||
public function getMenu($level = 1) {
|
||||
if($level == 1) {
|
||||
|
@ -1670,7 +1670,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
|
||||
// Content links
|
||||
$items = new ArrayList();
|
||||
|
||||
// We merge all into a regular DataObjectSet, because DataList doesn't support merge
|
||||
// We merge all into a regular SS_List, because DataList doesn't support merge
|
||||
if($contentLinks = $this->BackLinkTracking()) {
|
||||
foreach($contentLinks as $item) $item->DependentLinkType = 'Content link';
|
||||
$items->merge($contentLinks);
|
||||
|
@ -9,7 +9,7 @@
|
||||
*
|
||||
* {@link title()}: Return the title - i18n is your responsibility
|
||||
* {@link description()}: Return the description - i18n is your responsibility
|
||||
* {@link sourceQuery()}: Return a DataObjectSet of the search results
|
||||
* {@link sourceQuery()}: Return a SS_List of the search results
|
||||
* {@link columns()}: Return information about the columns in this report.
|
||||
* {@link parameterFields()}: Return a FieldList of the fields that can be used to filter this
|
||||
* report.
|
||||
@ -116,7 +116,7 @@ class SS_Report extends ViewableData {
|
||||
}
|
||||
|
||||
/**
|
||||
* Return a DataObjectSet records for this report.
|
||||
* Return a SS_List records for this report.
|
||||
*/
|
||||
function records($params) {
|
||||
if($this->hasMethod('sourceRecords')) return $this->sourceRecords($params, null, null);
|
||||
|
@ -26,7 +26,7 @@ class WidgetArea extends DataObject {
|
||||
* it easier to access and process form logic
|
||||
* and actions stored in {@link Widget_Controller}.
|
||||
*
|
||||
* @return DataObjectSet Collection of {@link Widget_Controller}
|
||||
* @return SS_List Collection of {@link Widget_Controller}
|
||||
*/
|
||||
function WidgetControllers() {
|
||||
$controllers = new ArrayList();
|
||||
|
@ -319,7 +319,7 @@ in the other stage:<br />
|
||||
* @param string $sort
|
||||
* @param string $join
|
||||
* @param int|array $limit
|
||||
* @return DataObjectSet
|
||||
* @return SS_List
|
||||
*/
|
||||
function getOrphanedPages($class = 'SiteTree', $filter = '', $sort = null, $join = null, $limit = null) {
|
||||
$filter .= ($filter) ? ' AND ' : '';
|
||||
|
Loading…
Reference in New Issue
Block a user