silverstripe / silverstripe-lumberjack

src/Forms/GridFieldSiteTreeState.php

Indentation +71 added lines, -71 removed lines

@@ -15,82 +15,82 @@
 **/
 class GridFieldSiteTreeState implements GridField_ColumnProvider
 {
-    use Injectable;
+	use Injectable;
 
-    public function augmentColumns($gridField, &$columns)
-    {
-        // Ensure Actions always appears as the last column.
-        $key = array_search('Actions', $columns);
-        if ($key !== false) {
-            unset($columns[$key]);
-        }
+	public function augmentColumns($gridField, &$columns)
+	{
+		// Ensure Actions always appears as the last column.
+		$key = array_search('Actions', $columns);
+		if ($key !== false) {
+			unset($columns[$key]);
+		}
 
-        $columns = array_merge($columns, array(
-            'State',
-            'Actions',
-        ));
-    }
+		$columns = array_merge($columns, array(
+			'State',
+			'Actions',
+		));
+	}
 
-    public function getColumnsHandled($gridField)
-    {
-        return array('State');
-    }
+	public function getColumnsHandled($gridField)
+	{
+		return array('State');
+	}
 
-    public function getColumnContent($gridField, $record, $columnName)
-    {
-        if ($columnName == 'State') {
-            if ($record->hasMethod('isPublished')) {
-                $modifiedLabel = '';
-                if ($record->isModifiedOnStage) {
-                    $modifiedLabel = "<span class='modified'>" . _t(__CLASS__ . '.Modified', 'Modified') . '</span>';
-                }
+	public function getColumnContent($gridField, $record, $columnName)
+	{
+		if ($columnName == 'State') {
+			if ($record->hasMethod('isPublished')) {
+				$modifiedLabel = '';
+				if ($record->isModifiedOnStage) {
+					$modifiedLabel = "<span class='modified'>" . _t(__CLASS__ . '.Modified', 'Modified') . '</span>';
+				}
 
-                $published = $record->isPublished();
-                if (!$published) {
-                    return _t(
-                        __CLASS__ . '.Draft',
-                        '<i class="btn-icon gridfield-icon btn-icon-pencil"></i> Saved as Draft on {date}',
-                        'State for when a post is saved.',
-                        array(
-                            'date' => $record->dbObject('LastEdited')->Nice()
-                        )
-                    );
-                }
-                return _t(
-                    __CLASS__ . '.Published',
-                    '<i class="btn-icon gridfield-icon btn-icon-accept"></i> Published on {date}',
-                    'State for when a post is published.',
-                    array(
-                        'date' => $record->dbObject('LastEdited')->Nice()
-                    )
-                ) . $modifiedLabel;
-            }
-        }
-    }
+				$published = $record->isPublished();
+				if (!$published) {
+					return _t(
+						__CLASS__ . '.Draft',
+						'<i class="btn-icon gridfield-icon btn-icon-pencil"></i> Saved as Draft on {date}',
+						'State for when a post is saved.',
+						array(
+							'date' => $record->dbObject('LastEdited')->Nice()
+						)
+					);
+				}
+				return _t(
+					__CLASS__ . '.Published',
+					'<i class="btn-icon gridfield-icon btn-icon-accept"></i> Published on {date}',
+					'State for when a post is published.',
+					array(
+						'date' => $record->dbObject('LastEdited')->Nice()
+					)
+				) . $modifiedLabel;
+			}
+		}
+	}
 
-    public function getColumnAttributes($gridField, $record, $columnName)
-    {
-        if ($columnName == 'State') {
-            if ($record->hasMethod('isPublished')) {
-                $published = $record->isPublished();
-                if (!$published) {
-                    $class = 'gridfield-icon draft';
-                } else {
-                    $class = 'gridfield-icon published';
-                }
-                return array('class' => $class);
-            }
-        }
-        return array();
-    }
+	public function getColumnAttributes($gridField, $record, $columnName)
+	{
+		if ($columnName == 'State') {
+			if ($record->hasMethod('isPublished')) {
+				$published = $record->isPublished();
+				if (!$published) {
+					$class = 'gridfield-icon draft';
+				} else {
+					$class = 'gridfield-icon published';
+				}
+				return array('class' => $class);
+			}
+		}
+		return array();
+	}
 
-    public function getColumnMetaData($gridField, $columnName)
-    {
-        switch ($columnName) {
-            case 'State':
-                return array('title' => _t(__CLASS__ . '.StateTitle', 'State', 'Column title for state'));
-            default:
-                break;
-        }
-    }
+	public function getColumnMetaData($gridField, $columnName)
+	{
+		switch ($columnName) {
+			case 'State':
+				return array('title' => _t(__CLASS__ . '.StateTitle', 'State', 'Column title for state'));
+			default:
+				break;
+		}
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -42,13 +42,13 @@ 
             if ($record->hasMethod('isPublished')) {
                 $modifiedLabel = '';
                 if ($record->isModifiedOnStage) {
-                    $modifiedLabel = "<span class='modified'>" . _t(__CLASS__ . '.Modified', 'Modified') . '</span>';
+                    $modifiedLabel = "<span class='modified'>"._t(__CLASS__.'.Modified', 'Modified').'</span>';
                 }
 
                 $published = $record->isPublished();
                 if (!$published) {
                     return _t(
-                        __CLASS__ . '.Draft',
+                        __CLASS__.'.Draft',
                         '<i class="btn-icon gridfield-icon btn-icon-pencil"></i> Saved as Draft on {date}',
                         'State for when a post is saved.',
                         array(
@@ -57,13 +57,13 @@ 
                     );
                 }
                 return _t(
-                    __CLASS__ . '.Published',
+                    __CLASS__.'.Published',
                     '<i class="btn-icon gridfield-icon btn-icon-accept"></i> Published on {date}',
                     'State for when a post is published.',
                     array(
                         'date' => $record->dbObject('LastEdited')->Nice()
                     )
-                ) . $modifiedLabel;
+                ).$modifiedLabel;
             }
         }
     }
@@ -88,7 +88,7 @@ 
     {
         switch ($columnName) {
             case 'State':
-                return array('title' => _t(__CLASS__ . '.StateTitle', 'State', 'Column title for state'));
+                return array('title' => _t(__CLASS__.'.StateTitle', 'State', 'Column title for state'));
             default:
                 break;
         }

src/Forms/GridFieldSiteTreeAddNewButton.php

Indentation +137 added lines, -137 removed lines

@@ -30,141 +30,141 @@
  */
 class GridFieldSiteTreeAddNewButton extends GridFieldAddNewButton implements GridField_ActionProvider
 {
-    /**
-     * Determine the list of classnames and titles allowed for a given parent object
-     *
-     * @param SiteTree $parent
-     * @return boolean
-     */
-    public function getAllowedChildren(SiteTree $parent = null)
-    {
-        if (!$parent || !$parent->canAddChildren()) {
-            return array();
-        }
-
-        $nonHiddenPageTypes = SiteTree::page_type_classes();
-        $allowedChildren = $parent->allowedChildren();
-        $children = array();
-        foreach ($allowedChildren as $class) {
-            if (Config::inst()->get($class, 'show_in_sitetree') === false) {
-                $instance = Injector::inst()->get($class);
-                // Note: Second argument to SiteTree::canCreate will support inherited permissions
-                // post 3.1.12, and will default to the old permission model in 3.1.11 or below
-                // See http://docs.silverstripe.org/en/changelogs/3.1.11
-                if ($instance->canCreate(null, array('Parent' => $parent)) && in_array($class, $nonHiddenPageTypes)) {
-                    $children[$class] = $instance->i18n_singular_name();
-                }
-            }
-        }
-        return $children;
-    }
-
-    public function getHTMLFragments($gridField)
-    {
-        $state = $gridField->State->GridFieldSiteTreeAddNewButton;
-
-        $parent = SiteTree::get()->byId(Controller::curr()->currentPageID());
-
-        if ($parent) {
-            $state->currentPageID = $parent->ID;
-        }
-
-        $children = $this->getAllowedChildren($parent);
-        if (empty($children)) {
-            return array();
-        } elseif (count($children) > 1) {
-            $pageTypes = DropdownField::create('PageType', 'Page Type', $children, $parent->defaultChild());
-            $pageTypes
-                ->setFieldHolderTemplate('GridFieldSiteTreeAddNewButton_holder')
-                ->addExtraClass('gridfield-dropdown no-change-track');
-
-            $state->pageType = $parent->defaultChild();
-
-            if (!$this->buttonName) {
-                $this->buttonName = _t(
-                    __CLASS__ . '.AddMultipleOptions',
-                    'Add new',
-                    'Add button text for multiple options.'
-                );
-            }
-        } else {
-            $keys = array_keys($children);
-            $pageTypes = HiddenField::create('PageType', 'Page Type', $keys[0]);
-
-            $state->pageType = $keys[0];
-
-            if (!$this->buttonName) {
-                $this->buttonName = _t(
-                    __CLASS__ . '.Add',
-                    'Add new {name}',
-                    'Add button text for a single option.',
-                    ['name' => $children[$keys[0]]]
-                );
-            }
-        }
-
-        $addAction = GridField_FormAction::create($gridField, 'add', $this->buttonName, 'add', 'add');
-        $addAction
-            ->setAttribute('data-icon', 'add')
-            ->addExtraClass('no-ajax btn btn-primary font-icon-plus');
-
-        $forTemplate = ArrayData::create();
-        $forTemplate->Fields = ArrayList::create();
-        $forTemplate->Fields->push($pageTypes);
-        $forTemplate->Fields->push($addAction);
-
-        Requirements::css('silverstripe/lumberjack:css/lumberjack.css');
-        Requirements::javascript('silverstripe/lumberjack:javascript/GridField.js');
-
-        return [$this->targetFragment => $forTemplate->renderWith(__CLASS__)];
-    }
-
-    /**
-     * Provide actions to this component.
-     *
-     * @param  GridField $gridField
-     * @return array
-    **/
-    public function getActions($gridField)
-    {
-        return array('add');
-    }
-
-    /**
-     * Handles the add action, but only acts as a wrapper for {@link CMSPageAddController::doAdd()}
-     *
-     * @param GridField $gridField
-     * @param string $actionName
-     * @param mixed $arguments
-     * @param array $data
-     *
-     * @return HTTPResponse|null
-     */
-    public function handleAction(GridField $gridField, $actionName, $arguments, $data)
-    {
-        if ($actionName == 'add') {
-            $tmpData = json_decode($data['ChildPages']['GridState'], true);
-            /** @skipUpgrade  */
-            $tmpData = $tmpData['GridFieldSiteTreeAddNewButton'];
-
-            $data = array(
-                'ParentID' => $tmpData['currentPageID'],
-                'PageType' => $tmpData['pageType']
-            );
-
-            /** @var $controller CMSPageAddController */
-            $controller = Injector::inst()->create(CMSPageAddController::class);
-
-            // pass current request to newly created controller
-            $request = Controller::curr()->getRequest();
-            $controller->setRequest($request);
-
-            $form = $controller->AddForm();
-            $form->loadDataFrom($data);
-
-            return $controller->doAdd($data, $form);
-        }
-
-        return null;
-    }
+	/**
+	 * Determine the list of classnames and titles allowed for a given parent object
+	 *
+	 * @param SiteTree $parent
+	 * @return boolean
+	 */
+	public function getAllowedChildren(SiteTree $parent = null)
+	{
+		if (!$parent || !$parent->canAddChildren()) {
+			return array();
+		}
+
+		$nonHiddenPageTypes = SiteTree::page_type_classes();
+		$allowedChildren = $parent->allowedChildren();
+		$children = array();
+		foreach ($allowedChildren as $class) {
+			if (Config::inst()->get($class, 'show_in_sitetree') === false) {
+				$instance = Injector::inst()->get($class);
+				// Note: Second argument to SiteTree::canCreate will support inherited permissions
+				// post 3.1.12, and will default to the old permission model in 3.1.11 or below
+				// See http://docs.silverstripe.org/en/changelogs/3.1.11
+				if ($instance->canCreate(null, array('Parent' => $parent)) && in_array($class, $nonHiddenPageTypes)) {
+					$children[$class] = $instance->i18n_singular_name();
+				}
+			}
+		}
+		return $children;
+	}
+
+	public function getHTMLFragments($gridField)
+	{
+		$state = $gridField->State->GridFieldSiteTreeAddNewButton;
+
+		$parent = SiteTree::get()->byId(Controller::curr()->currentPageID());
+
+		if ($parent) {
+			$state->currentPageID = $parent->ID;
+		}
+
+		$children = $this->getAllowedChildren($parent);
+		if (empty($children)) {
+			return array();
+		} elseif (count($children) > 1) {
+			$pageTypes = DropdownField::create('PageType', 'Page Type', $children, $parent->defaultChild());
+			$pageTypes
+				->setFieldHolderTemplate('GridFieldSiteTreeAddNewButton_holder')
+				->addExtraClass('gridfield-dropdown no-change-track');
+
+			$state->pageType = $parent->defaultChild();
+
+			if (!$this->buttonName) {
+				$this->buttonName = _t(
+					__CLASS__ . '.AddMultipleOptions',
+					'Add new',
+					'Add button text for multiple options.'
+				);
+			}
+		} else {
+			$keys = array_keys($children);
+			$pageTypes = HiddenField::create('PageType', 'Page Type', $keys[0]);
+
+			$state->pageType = $keys[0];
+
+			if (!$this->buttonName) {
+				$this->buttonName = _t(
+					__CLASS__ . '.Add',
+					'Add new {name}',
+					'Add button text for a single option.',
+					['name' => $children[$keys[0]]]
+				);
+			}
+		}
+
+		$addAction = GridField_FormAction::create($gridField, 'add', $this->buttonName, 'add', 'add');
+		$addAction
+			->setAttribute('data-icon', 'add')
+			->addExtraClass('no-ajax btn btn-primary font-icon-plus');
+
+		$forTemplate = ArrayData::create();
+		$forTemplate->Fields = ArrayList::create();
+		$forTemplate->Fields->push($pageTypes);
+		$forTemplate->Fields->push($addAction);
+
+		Requirements::css('silverstripe/lumberjack:css/lumberjack.css');
+		Requirements::javascript('silverstripe/lumberjack:javascript/GridField.js');
+
+		return [$this->targetFragment => $forTemplate->renderWith(__CLASS__)];
+	}
+
+	/**
+	 * Provide actions to this component.
+	 *
+	 * @param  GridField $gridField
+	 * @return array
+	 **/
+	public function getActions($gridField)
+	{
+		return array('add');
+	}
+
+	/**
+	 * Handles the add action, but only acts as a wrapper for {@link CMSPageAddController::doAdd()}
+	 *
+	 * @param GridField $gridField
+	 * @param string $actionName
+	 * @param mixed $arguments
+	 * @param array $data
+	 *
+	 * @return HTTPResponse|null
+	 */
+	public function handleAction(GridField $gridField, $actionName, $arguments, $data)
+	{
+		if ($actionName == 'add') {
+			$tmpData = json_decode($data['ChildPages']['GridState'], true);
+			/** @skipUpgrade  */
+			$tmpData = $tmpData['GridFieldSiteTreeAddNewButton'];
+
+			$data = array(
+				'ParentID' => $tmpData['currentPageID'],
+				'PageType' => $tmpData['pageType']
+			);
+
+			/** @var $controller CMSPageAddController */
+			$controller = Injector::inst()->create(CMSPageAddController::class);
+
+			// pass current request to newly created controller
+			$request = Controller::curr()->getRequest();
+			$controller->setRequest($request);
+
+			$form = $controller->AddForm();
+			$form->loadDataFrom($data);
+
+			return $controller->doAdd($data, $form);
+		}
+
+		return null;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -82,7 +82,7 @@ 
 
             if (!$this->buttonName) {
                 $this->buttonName = _t(
-                    __CLASS__ . '.AddMultipleOptions',
+                    __CLASS__.'.AddMultipleOptions',
                     'Add new',
                     'Add button text for multiple options.'
                 );
@@ -95,7 +95,7 @@ 
 
             if (!$this->buttonName) {
                 $this->buttonName = _t(
-                    __CLASS__ . '.Add',
+                    __CLASS__.'.Add',
                     'Add new {name}',
                     'Add button text for a single option.',
                     ['name' => $children[$keys[0]]]

src/Model/Lumberjack.php

Indentation +206 added lines, -206 removed lines

@@ -28,210 +28,210 @@
  */
 class Lumberjack extends SiteTreeExtension
 {
-    /**
-     * Loops through subclasses of the owner (intended to be SiteTree) and checks if they've been hidden.
-     *
-     * @return array
-     **/
-    public function getExcludedSiteTreeClassNames()
-    {
-        $classes = array();
-        $siteTreeClasses = $this->owner->allowedChildren();
-
-        foreach ($siteTreeClasses as $class) {
-            if (Config::inst()->get($class, 'show_in_sitetree') === false) {
-                $classes[$class] = $class;
-            }
-        }
-
-        return $classes;
-    }
-
-    /**
-     * This is responsible for adding the child pages tab and gridfield.
-     *
-     * @param FieldList $fields
-     */
-    public function updateCMSFields(FieldList $fields)
-    {
-        $excluded = $this->owner->getExcludedSiteTreeClassNames();
-        if (!empty($excluded)) {
-            $pages = $this->getLumberjackPagesForGridfield($excluded);
-            $gridField = GridField::create(
-                'ChildPages',
-                $this->getLumberjackTitle(),
-                $pages,
-                $this->getLumberjackGridFieldConfig()
-            );
-
-            $tab = Tab::create('ChildPages', $this->getLumberjackTitle(), $gridField);
-            $fields->insertAfter($tab, 'Main');
-        }
-    }
-
-    /**
-     * Return children in the stage site.
-     *
-     * @param bool $showAll Include all of the elements, even those not shown in the menus. Only applicable when
-     *                      extension is applied to {@link SiteTree}.
-     * @return DataList
-     */
-    public function stageChildren($showAll = false)
-    {
-        $config = $this->owner->config();
-        $hideFromHierarchy = $config->get('hide_from_hierarchy');
-        $hideFromCMSTree = $config->get('hide_from_cms_tree');
-        $baseClass = $this->owner->baseClass();
-
-        $staged = $baseClass::get()
-            ->filter('ParentID', (int)$this->owner->ID)
-            ->exclude('ID', (int)$this->owner->ID);
-
-        if ($hideFromHierarchy) {
-            $staged = $staged->exclude('ClassName', $hideFromHierarchy);
-        }
-
-        if ($hideFromCMSTree && $this->showingCMSTree()) {
-            $staged = $staged->exclude('ClassName', $hideFromCMSTree);
-        }
-
-        if (!$showAll && DataObject::getSchema()->fieldSpec($this->owner, 'ShowInMenus')) {
-            $staged = $staged->filter('ShowInMenus', 1);
-        }
-
-        $this->owner->extend("augmentStageChildren", $staged, $showAll);
-        $staged = $this->excludeSiteTreeClassNames($staged);
-        return $staged;
-    }
-
-    /**
-     * Excludes any hidden owner subclasses. Note that the returned DataList will be a different
-     * instance from the original.
-     *
-     * @param DataList $list
-     * @return DataList
-     */
-    protected function excludeSiteTreeClassNames($list)
-    {
-        $classNames = $this->owner->getExcludedSiteTreeClassNames();
-        if ($this->shouldFilter() && count($classNames)) {
-            // Filter the SiteTree
-            $list = $list->exclude('ClassName', $classNames);
-        }
-        return $list;
-    }
-
-    /**
-     * Return children in the live site, if it exists.
-     *
-     * @param bool $showAll              Include all of the elements, even those not shown in the menus. Only
-     *                                   applicable when extension is applied to {@link SiteTree}.
-     * @param bool $onlyDeletedFromStage Only return items that have been deleted from stage
-     * @return DataList
-     * @throws Exception
-     */
-    public function liveChildren($showAll = false, $onlyDeletedFromStage = false)
-    {
-        if (!$this->owner->hasExtension(Versioned::class)) {
-            throw new Exception('Hierarchy->liveChildren() only works with Versioned extension applied');
-        }
-
-        $config = $this->owner->config();
-        $hideFromHierarchy = $config->get('hide_from_hierarchy');
-        $hideFromCMSTree = $config->get('hide_from_cms_tree');
-        $baseClass = $this->owner->baseClass();
-
-        $children = $baseClass::get()
-            ->filter('ParentID', (int)$this->owner->ID)
-            ->exclude('ID', (int)$this->owner->ID)
-            ->setDataQueryParam(array(
-                'Versioned.mode' => $onlyDeletedFromStage ? 'stage_unique' : 'stage',
-                'Versioned.stage' => 'Live'
-            ));
-
-        if ($hideFromHierarchy) {
-            $children = $children->exclude('ClassName', $hideFromHierarchy);
-        }
-
-        if ($hideFromCMSTree && $this->showingCMSTree()) {
-            $children = $children->exclude('ClassName', $hideFromCMSTree);
-        }
-
-        if (!$showAll && DataObject::getSchema()->fieldSpec($this->owner, 'ShowInMenus')) {
-            $children = $children->filter('ShowInMenus', 1);
-        }
-        $children = $this->excludeSiteTreeClassNames($children);
-
-        return $children;
-    }
-
-    /**
-     * This returns the title for the tab and GridField. This can be overwritten
-     * in the owner class.
-     *
-     * @return string
-     */
-    protected function getLumberjackTitle()
-    {
-        if (method_exists($this->owner, 'getLumberjackTitle')) {
-            return $this->owner->getLumberjackTitle();
-        }
-
-        return _t(__CLASS__ . '.TabTitle', 'Child Pages');
-    }
-
-    /**
-     * This returns the gird field config for the lumberjack gridfield.
-     *
-     * @return GridFieldConfig_Lumberjack
-     */
-    protected function getLumberjackGridFieldConfig()
-    {
-        if (method_exists($this->owner, 'getLumberjackGridFieldConfig')) {
-            return $this->owner->getLumberjackGridFieldConfig();
-        }
-
-        return GridFieldConfig_Lumberjack::create();
-    }
-
-    /**
-     * Checks if we're on a controller where we should filter. ie. Are we loading the SiteTree?
-     * NB: This only checks the current controller. See https://github.com/silverstripe/silverstripe-lumberjack/pull/60
-     * for a discussion around this.
-     *
-     * @return bool
-     */
-    protected function shouldFilter()
-    {
-        $controller = Controller::curr();
-
-        // relevant only for CMS
-        if (!($controller instanceof LeftAndMain)) {
-            return false;
-        }
-
-        return in_array($controller->getAction(), [
-            'index', 'show', 'treeview', 'listview', 'getsubtree'
-        ]);
-    }
-
-    /**
-     * Returns list of pages for the CMS gridfield
-     *
-     * This also allows the owner class to override this method, e.g. to provide custom ordering.
-     *
-     * @var array $excluded     List of class names excluded from the SiteTree
-     * @return DataList
-     */
-    public function getLumberjackPagesForGridfield($excluded = array())
-    {
-        if (method_exists($this->owner, 'getLumberjackPagesForGridfield')) {
-            return $this->owner->getLumberjackPagesForGridfield($excluded);
-        }
-
-        return SiteTree::get()->filter([
-            'ParentID' => $this->owner->ID,
-            'ClassName' => $excluded,
-        ]);
-    }
+	/**
+	 * Loops through subclasses of the owner (intended to be SiteTree) and checks if they've been hidden.
+	 *
+	 * @return array
+	 **/
+	public function getExcludedSiteTreeClassNames()
+	{
+		$classes = array();
+		$siteTreeClasses = $this->owner->allowedChildren();
+
+		foreach ($siteTreeClasses as $class) {
+			if (Config::inst()->get($class, 'show_in_sitetree') === false) {
+				$classes[$class] = $class;
+			}
+		}
+
+		return $classes;
+	}
+
+	/**
+	 * This is responsible for adding the child pages tab and gridfield.
+	 *
+	 * @param FieldList $fields
+	 */
+	public function updateCMSFields(FieldList $fields)
+	{
+		$excluded = $this->owner->getExcludedSiteTreeClassNames();
+		if (!empty($excluded)) {
+			$pages = $this->getLumberjackPagesForGridfield($excluded);
+			$gridField = GridField::create(
+				'ChildPages',
+				$this->getLumberjackTitle(),
+				$pages,
+				$this->getLumberjackGridFieldConfig()
+			);
+
+			$tab = Tab::create('ChildPages', $this->getLumberjackTitle(), $gridField);
+			$fields->insertAfter($tab, 'Main');
+		}
+	}
+
+	/**
+	 * Return children in the stage site.
+	 *
+	 * @param bool $showAll Include all of the elements, even those not shown in the menus. Only applicable when
+	 *                      extension is applied to {@link SiteTree}.
+	 * @return DataList
+	 */
+	public function stageChildren($showAll = false)
+	{
+		$config = $this->owner->config();
+		$hideFromHierarchy = $config->get('hide_from_hierarchy');
+		$hideFromCMSTree = $config->get('hide_from_cms_tree');
+		$baseClass = $this->owner->baseClass();
+
+		$staged = $baseClass::get()
+			->filter('ParentID', (int)$this->owner->ID)
+			->exclude('ID', (int)$this->owner->ID);
+
+		if ($hideFromHierarchy) {
+			$staged = $staged->exclude('ClassName', $hideFromHierarchy);
+		}
+
+		if ($hideFromCMSTree && $this->showingCMSTree()) {
+			$staged = $staged->exclude('ClassName', $hideFromCMSTree);
+		}
+
+		if (!$showAll && DataObject::getSchema()->fieldSpec($this->owner, 'ShowInMenus')) {
+			$staged = $staged->filter('ShowInMenus', 1);
+		}
+
+		$this->owner->extend("augmentStageChildren", $staged, $showAll);
+		$staged = $this->excludeSiteTreeClassNames($staged);
+		return $staged;
+	}
+
+	/**
+	 * Excludes any hidden owner subclasses. Note that the returned DataList will be a different
+	 * instance from the original.
+	 *
+	 * @param DataList $list
+	 * @return DataList
+	 */
+	protected function excludeSiteTreeClassNames($list)
+	{
+		$classNames = $this->owner->getExcludedSiteTreeClassNames();
+		if ($this->shouldFilter() && count($classNames)) {
+			// Filter the SiteTree
+			$list = $list->exclude('ClassName', $classNames);
+		}
+		return $list;
+	}
+
+	/**
+	 * Return children in the live site, if it exists.
+	 *
+	 * @param bool $showAll              Include all of the elements, even those not shown in the menus. Only
+	 *                                   applicable when extension is applied to {@link SiteTree}.
+	 * @param bool $onlyDeletedFromStage Only return items that have been deleted from stage
+	 * @return DataList
+	 * @throws Exception
+	 */
+	public function liveChildren($showAll = false, $onlyDeletedFromStage = false)
+	{
+		if (!$this->owner->hasExtension(Versioned::class)) {
+			throw new Exception('Hierarchy->liveChildren() only works with Versioned extension applied');
+		}
+
+		$config = $this->owner->config();
+		$hideFromHierarchy = $config->get('hide_from_hierarchy');
+		$hideFromCMSTree = $config->get('hide_from_cms_tree');
+		$baseClass = $this->owner->baseClass();
+
+		$children = $baseClass::get()
+			->filter('ParentID', (int)$this->owner->ID)
+			->exclude('ID', (int)$this->owner->ID)
+			->setDataQueryParam(array(
+				'Versioned.mode' => $onlyDeletedFromStage ? 'stage_unique' : 'stage',
+				'Versioned.stage' => 'Live'
+			));
+
+		if ($hideFromHierarchy) {
+			$children = $children->exclude('ClassName', $hideFromHierarchy);
+		}
+
+		if ($hideFromCMSTree && $this->showingCMSTree()) {
+			$children = $children->exclude('ClassName', $hideFromCMSTree);
+		}
+
+		if (!$showAll && DataObject::getSchema()->fieldSpec($this->owner, 'ShowInMenus')) {
+			$children = $children->filter('ShowInMenus', 1);
+		}
+		$children = $this->excludeSiteTreeClassNames($children);
+
+		return $children;
+	}
+
+	/**
+	 * This returns the title for the tab and GridField. This can be overwritten
+	 * in the owner class.
+	 *
+	 * @return string
+	 */
+	protected function getLumberjackTitle()
+	{
+		if (method_exists($this->owner, 'getLumberjackTitle')) {
+			return $this->owner->getLumberjackTitle();
+		}
+
+		return _t(__CLASS__ . '.TabTitle', 'Child Pages');
+	}
+
+	/**
+	 * This returns the gird field config for the lumberjack gridfield.
+	 *
+	 * @return GridFieldConfig_Lumberjack
+	 */
+	protected function getLumberjackGridFieldConfig()
+	{
+		if (method_exists($this->owner, 'getLumberjackGridFieldConfig')) {
+			return $this->owner->getLumberjackGridFieldConfig();
+		}
+
+		return GridFieldConfig_Lumberjack::create();
+	}
+
+	/**
+	 * Checks if we're on a controller where we should filter. ie. Are we loading the SiteTree?
+	 * NB: This only checks the current controller. See https://github.com/silverstripe/silverstripe-lumberjack/pull/60
+	 * for a discussion around this.
+	 *
+	 * @return bool
+	 */
+	protected function shouldFilter()
+	{
+		$controller = Controller::curr();
+
+		// relevant only for CMS
+		if (!($controller instanceof LeftAndMain)) {
+			return false;
+		}
+
+		return in_array($controller->getAction(), [
+			'index', 'show', 'treeview', 'listview', 'getsubtree'
+		]);
+	}
+
+	/**
+	 * Returns list of pages for the CMS gridfield
+	 *
+	 * This also allows the owner class to override this method, e.g. to provide custom ordering.
+	 *
+	 * @var array $excluded     List of class names excluded from the SiteTree
+	 * @return DataList
+	 */
+	public function getLumberjackPagesForGridfield($excluded = array())
+	{
+		if (method_exists($this->owner, 'getLumberjackPagesForGridfield')) {
+			return $this->owner->getLumberjackPagesForGridfield($excluded);
+		}
+
+		return SiteTree::get()->filter([
+			'ParentID' => $this->owner->ID,
+			'ClassName' => $excluded,
+		]);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -177,7 +177,7 @@
             return $this->owner->getLumberjackTitle();
         }
 
-        return _t(__CLASS__ . '.TabTitle', 'Child Pages');
+        return _t(__CLASS__.'.TabTitle', 'Child Pages');
     }
 
     /**