(merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60268 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2008-08-10 23:53:56 +00:00
parent 66b916abc5
commit 2ea27c63f9

View File

@ -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 = '<a href=\"' . $this->Link() . '/$ID/edit\">$value</a>';
$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(