tonyair/silverstripe-reports
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-reports synced 2024-10-22 11:05:53 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #100 from silverstripe/trac-6901

Browse Source 
Trac #6901
This commit is contained in:
Sean Harvey 2012-04-14 03:30:42 -07:00
commit dccde5f512
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
code/forms/SiteTreeURLSegmentField.php
View File

@ -1,24 +1,21 @@
<?php
/**
* @package cms
* @subpackage forms
*/
/**
* Used to edit the SiteTree->URLSegment property, and suggest input based on the serverside rules
* defined through {@link SiteTree->generateURLSegment()} and {@link URLSegmentFilter}.
*
* Note: The actual conversion for saving the value takes place in the model layer.
*
* @package cms
* @subpackage forms
*/
class SiteTreeURLSegmentField extends TextField {
protected $template = 'SiteTreeURLSegmentField';
/** @var String */
protected $helpText;
/** @var String */
protected $urlPrefix;
/**
* @var string
*/
protected $helpText, $urlPrefix;
static $allowed_actions = array(
'suggest'
@ -81,6 +78,4 @@ class SiteTreeURLSegmentField extends TextField {
function Type() {
return 'text sitetreeurlsegment';
}
}

9
code/model/SiteTree.php
View File

@ -1898,8 +1898,10 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
)),
$parentIDField = new TreeDropdownField("ParentID", $this->fieldLabel('ParentID'), 'SiteTree', 'ID', 'MenuTitle')
),
new CheckboxField("ShowInMenus", $this->fieldLabel('ShowInMenus')),
new CheckboxField("ShowInSearch", $this->fieldLabel('ShowInSearch'))
$visibility = new FieldGroup(
new CheckboxField("ShowInMenus", $this->fieldLabel('ShowInMenus')),
new CheckboxField("ShowInSearch", $this->fieldLabel('ShowInSearch'))
)
),
$tabAccess = new Tab('Access',
$viewersOptionsField = new OptionsetField(
@ -1918,6 +1920,8 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
)
);
$visibility->setTitle($this->fieldLabel('Visibility'));
/*
* This filter ensures that the ParentID dropdown selection does not show this node,
* or its descendents, as this causes vanishing bugs.
@ -2001,6 +2005,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
$labels['CanViewType'] = _t('SiteTree.Viewers', 'Viewers Groups');
$labels['CanEditType'] = _t('SiteTree.Editors', 'Editors Groups');
$labels['Comments'] = _t('SiteTree.Comments', 'Comments');
$labels['Visibility'] = _t('SiteTree.Visibility', 'Visibility');
$labels['LinkChangeNote'] = _t (
'SiteTree.LINKCHANGENOTE', 'Changing this page\'s link will also affect the links of all child pages.'
);