tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

API CHANGE Changed name from DataObjectSet to either ArrayList or DataList

Browse Source
This commit is contained in:
Stig Lindqvist 2011-10-26 18:39:21 +13:00 committed by Stig Lindqvist
parent 05e90838c0
commit d799c80cc5
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/controller/SilverStripeNavigator.php
View File

@ -31,7 +31,7 @@ class SilverStripeNavigator extends ViewableData {
} }
/** /**
* @return DataObjectSet of SilverStripeNavigatorItem * @return SS_List of SilverStripeNavigatorItem
*/ */
function getItems() { function getItems() {
$items = array(); $items = array();
@ -59,7 +59,7 @@ class SilverStripeNavigator extends ViewableData {
} }
ksort($items); ksort($items);
return new DataObjectSet($items); return new ArrayList($items);
} }
/** /**

2
code/controllers/CMSMain.php
View File

@ -284,7 +284,7 @@ JS;
* Populates an array of classes in the CMS * Populates an array of classes in the CMS
* which allows the user to change the page type. * which allows the user to change the page type.
* *
* @return DataObjectSet * @return SS_List
*/ */
public function PageTypes() { public function PageTypes() {
$classes = SiteTree::page_type_classes(); $classes = SiteTree::page_type_classes();

6
code/controllers/ContentController.php
View File

@ -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. * Return the children of a given page. The parent reference can either be a page link or an ID.
* *
* @param string|int $parentRef * @param string|int $parentRef
* @return DataObjectSet * @return SS_List
*/ */
public function ChildrenOf($parentRef) { public function ChildrenOf($parentRef) {
$parent = SiteTree::get_by_link($parentRef); $parent = SiteTree::get_by_link($parentRef);
@ -78,7 +78,7 @@ class ContentController extends Controller {
} }
/** /**
* @return DataObjectSet * @return SS_List
*/ */
public function Page($link) { public function Page($link) {
return SiteTree::get_by_link($link); return SiteTree::get_by_link($link);
@ -283,7 +283,7 @@ class ContentController extends Controller {
/** /**
* Returns a fixed navigation menu of the given level. * Returns a fixed navigation menu of the given level.
* @return DataObjectSet * @return SS_List
*/ */
public function getMenu($level = 1) { public function getMenu($level = 1) {
if($level == 1) { if($level == 1) {

2
code/model/SiteTree.php
View File

@ -1670,7 +1670,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
// Content links // Content links
$items = new ArrayList(); $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()) { if($contentLinks = $this->BackLinkTracking()) {
foreach($contentLinks as $item) $item->DependentLinkType = 'Content link'; foreach($contentLinks as $item) $item->DependentLinkType = 'Content link';
$items->merge($contentLinks); $items->merge($contentLinks);

4
code/reports/Report.php
View File

@ -9,7 +9,7 @@
* *
* {@link title()}: Return the title - i18n is your responsibility * {@link title()}: Return the title - i18n is your responsibility
* {@link description()}: Return the description - 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 columns()}: Return information about the columns in this report.
* {@link parameterFields()}: Return a FieldList of the fields that can be used to filter this * {@link parameterFields()}: Return a FieldList of the fields that can be used to filter this
* report. * 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) { function records($params) {
if($this->hasMethod('sourceRecords')) return $this->sourceRecords($params, null, null); if($this->hasMethod('sourceRecords')) return $this->sourceRecords($params, null, null);

2
code/widgets/WidgetArea.php
View File

@ -26,7 +26,7 @@ class WidgetArea extends DataObject {
* it easier to access and process form logic * it easier to access and process form logic
* and actions stored in {@link Widget_Controller}. * and actions stored in {@link Widget_Controller}.
* *
* @return DataObjectSet Collection of {@link Widget_Controller} * @return SS_List Collection of {@link Widget_Controller}
*/ */
function WidgetControllers() { function WidgetControllers() {
$controllers = new ArrayList(); $controllers = new ArrayList();

2
tasks/RemoveOrphanedPagesTask.php
View File

@ -319,7 +319,7 @@ in the other stage:<br />
* @param string $sort * @param string $sort
* @param string $join * @param string $join
* @param int|array $limit * @param int|array $limit
* @return DataObjectSet * @return SS_List
*/ */
function getOrphanedPages($class = 'SiteTree', $filter = '', $sort = null, $join = null, $limit = null) { function getOrphanedPages($class = 'SiteTree', $filter = '', $sort = null, $join = null, $limit = null) {
$filter .= ($filter) ? ' AND ' : ''; $filter .= ($filter) ? ' AND ' : '';