From d4ad902aaf24fbebdaf8f69838d75a52e1e9a3b5 Mon Sep 17 00:00:00 2001 From: Stefan Neuser Date: Wed, 23 Apr 2014 13:39:57 +0200 Subject: [PATCH 1/3] Update customize-cms-tree.md --- docs/en/howto/customize-cms-tree.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/en/howto/customize-cms-tree.md b/docs/en/howto/customize-cms-tree.md index 4651a59b6..742d3b547 100644 --- a/docs/en/howto/customize-cms-tree.md +++ b/docs/en/howto/customize-cms-tree.md @@ -67,8 +67,8 @@ __Example: using a subclass__ // return either true or false } - public function getStatusFlags(){ - $flags = parent::getStatusFlags(); + public function getStatusFlags($cached = true) { + $flags = parent::getStatusFlags($cached); $flags['scheduledtopublish'] = "Scheduled To Publish"; return $flags; } @@ -78,4 +78,4 @@ The above subclass of `[api:SiteTree]` will add a new flag for indicating its __'Scheduled To Publish'__ status. The look of the page node will be changed from ![Normal Page Node](../_images/page_node_normal.png) to ![Scheduled Page Node](../_images/page_node_scheduled.png). The getStatusFlags has an `updateStatusFlags()` extension point, so the flags can be modified through `DataExtension` rather than -inheritance as well. Deleting existing flags works by simply unsetting the array key. \ No newline at end of file +inheritance as well. Deleting existing flags works by simply unsetting the array key. From f64715b4c95fc29e731e0232350dbf2f679b19c6 Mon Sep 17 00:00:00 2001 From: Shaun de Greeff Date: Sun, 27 Jul 2014 21:32:39 +0200 Subject: [PATCH 2/3] Update composer.md Add a link to the Windows wamp page so that people will find info on how to install composer on windows more readily --- docs/en/installation/composer.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/en/installation/composer.md b/docs/en/installation/composer.md index 585af09b2..c74654d49 100644 --- a/docs/en/installation/composer.md +++ b/docs/en/installation/composer.md @@ -39,6 +39,9 @@ If you already have composer installed you can update it by running: Composer updates regularly, so you should run this command fairly often. These instructions assume you are running the latest version. +## Installing Composer on Windows WAMP +For those that use WAMP as a development environment, [detailed information is available on installing using Composer.](/windows-wamp#install-wamp) + ## Create a new site Composer can create a new site for you, using the installer as a template (by default composer will download the latest stable version): From e7d5537f34dc570b1971be6303ea8ea70b262d94 Mon Sep 17 00:00:00 2001 From: John Milmine Date: Fri, 23 May 2014 20:55:20 +1200 Subject: [PATCH 3/3] Added hasMethod so that you can pass ArrayData to GridField --- forms/gridfield/GridField.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forms/gridfield/GridField.php b/forms/gridfield/GridField.php index 3e84087b3..f244c813f 100644 --- a/forms/gridfield/GridField.php +++ b/forms/gridfield/GridField.php @@ -339,7 +339,7 @@ class GridField extends FormField { if($total > 0) { $rows = array(); foreach($list as $idx => $record) { - if(!$record->canView()) { + if($record->hasMethod('canView') && !$record->canView()) { continue; } $rowContent = '';