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

MINOR Fixed parameters in CMSMain->getfilteredsubtree()

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92723 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2009-11-21 03:15:43 +00:00
parent 44e16b9620
commit 49ff1648bd
1 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
code/CMSMain.php
View File

@ -138,13 +138,13 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
*
* @return string
*/
public function getfilteredsubtree($request) {
public function getfilteredsubtree($data, $form) {
$params = $form->getData();
// Get the tree
$tree = $this->getSiteTreeFor(
$this->stat('tree_class'),
$request->requestVar('ID'),
$data['ID'],
null,
array(new CMSMainMarkingFilter($params), 'mark')
);
@ -155,29 +155,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
return $tree;
}
/**
* Returns a list of batch actions
*/
function SiteTreeFilters() {
$filters = ClassInfo::subclassesFor('CMSSiteTreeFilter');
array_shift($filters);
$doSet = new DataObjectSet();
$doSet->push(new ArrayData(array(
'ClassName' => 'all',
'Title' => 'All items'
)));
foreach($filters as $filter) {
if (call_user_func(array($filter, 'showInList'))) {
$doSet->push(new ArrayData(array(
'ClassName' => $filter,
'Title' => call_user_func(array($filter, 'title'))
)));
}
}
return $doSet;
}
public function generateDataTreeHints() {
$classes = ClassInfo::subclassesFor( $this->stat('tree_class') );
@ -1059,6 +1037,18 @@ JS;
array_unshift($pageTypes, 'All');
$pageTypes = array_combine($pageTypes, $pageTypes);
asort($pageTypes);
// get all filter instances
$filters = ClassInfo::subclassesFor('CMSSiteTreeFilter');
$filterMap = array();
// remove base class
array_shift($filters);
// add filters to map
foreach($filters as $filter) {
if(!call_user_func(array($filter, 'showInList'))) continue;
$filterMap[$filter] = call_user_func(array($filter, 'title'));
}
$form = new Form(
$this,
@ -1068,9 +1058,10 @@ JS;
'Title',
_t('CMSMain.TITLEOPT', 'Title')
),
new DropdownField('filter', 'Type', $filterMap, null, null, 'Any'),
new TextField('Content', 'Text'),
new CalendarDateField('EditedSince', _t('CMSMain_left.ss.EDITEDSINCE','Edited Since')),
new DropdownField('ClassName', 'Page Type', $pageTypes, null, 'Any'),
new DropdownField('ClassName', 'Page Type', $pageTypes, null, null, 'Any'),
new TextField(
'MenuTitle',
_t('CMSMain.MENUTITLEOPT', 'Navigation Label')