Merge branch '3.0' into 3.1

This commit is contained in:
Sean Harvey 2013-04-22 17:14:45 +12:00
commit 8278181b92

View File

@ -42,7 +42,7 @@ Here is an example where we display a basic gridfield with the default settings:
:::php
class GridController extends Page_Controller {
private static $allowed_actions = array('index');
private static $allowed_actions = array('index', 'AllPages');
public function index(SS_HTTPRequest $request) {
$this->Content = $this->AllPages();
@ -331,4 +331,4 @@ records, use the `DataObject->can...()` methods
## Related
* [ModelAdmin: A UI driven by GridField](/reference/modeladmin)
* [Tutorial 5: Dataobject Relationship Management](/tutorials/5-dataobject-relationship-management)
* [Tutorial 5: Dataobject Relationship Management](/tutorials/5-dataobject-relationship-management)