From 2ea27c63f913e763697ff41c8b5f4327b5216158 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Sun, 10 Aug 2008 23:53:56 +0000 Subject: [PATCH] (merged from branches/roa. use "svn log -c -g " for detailed commit message) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60268 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/ModelAdmin.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/ModelAdmin.php b/code/ModelAdmin.php index 7cab84ff..18989e67 100644 --- a/code/ModelAdmin.php +++ b/code/ModelAdmin.php @@ -435,7 +435,7 @@ class ModelAdmin_CollectionController extends Controller { */ function ResultsForm() { $model = singleton($this->modelClass); - $summaryFields = $model->summaryFields(); + $summaryFields = $model->summaryFields(); $tf = new TableListField( $this->modelClass, $this->modelClass, @@ -444,10 +444,10 @@ class ModelAdmin_CollectionController extends Controller { $tf->setCustomQuery($this->getSearchQuery()); $tf->setPageSize($this->parentController->stat('page_length')); $tf->setShowPagination(true); - $tf->setPermissions(array('view')); + $tf->setPermissions(array_merge(array('view'), $model->stat('results_permissions'))); $url = 'Link() . '/$ID/edit\">$value'; $tf->setFieldFormatting(array_combine(array_keys($summaryFields), array_fill(0,count($summaryFields), $url))); - + // implemented as a form to enable further actions on the resultset // (serverside sorting, export as CSV, etc) $form = new Form(