tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-03 14:48:38 +02:00
Code Issues Projects Releases Wiki Activity

MINOR make showing virtual pages tab conditional

Browse Source 
MINOR made virtual page tracking sitetree tablelistfield subsite agnostic (from r98005) (from r98223)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102630 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2010-04-13 02:29:51 +00:00
parent a2883d0354
commit 5ff636c6b4
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/model/SiteTree.php
View File

@ -1661,8 +1661,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
'AbsoluteLink' => 'URL' 'AbsoluteLink' => 'URL'
), ),
'"CopyContentFromID" = ' . $this->ID, '"CopyContentFromID" = ' . $this->ID,
''//, ''
// 'LEFT JOIN "SiteTree_LinkTracking" ON "SiteTree"."ID" = "SiteTree_LinkTracking"."SiteTreeID"'
); );
$virtualPagesTable->setFieldFormatting(array( $virtualPagesTable->setFieldFormatting(array(
'Title' => '<a href=\"admin/show/$ID\">$Title</a>' 'Title' => '<a href=\"admin/show/$ID\">$Title</a>'
@ -1674,7 +1673,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
// Lay out the fields // Lay out the fields
$fields = new FieldSet( $fields = new FieldSet(
new TabSet("Root", $rootTab = new TabSet("Root",
$tabContent = new TabSet('Content', $tabContent = new TabSet('Content',
$tabMain = new Tab('Main', $tabMain = new Tab('Main',
new TextField("Title", $this->fieldLabel('Title')), new TextField("Title", $this->fieldLabel('Title')),
@ -1739,10 +1738,6 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
$tabBacklinks = new Tab('Backlinks', $tabBacklinks = new Tab('Backlinks',
$backLinksNote, $backLinksNote,
$backLinksTable $backLinksTable
),
$tabVirtualPages = new Tab('VirtualPages',
$virtualPagesNote,
$virtualPagesTable
) )
), ),
$tabAccess = new Tab('Access', $tabAccess = new Tab('Access',
@ -1762,6 +1757,13 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
) )
); );
if ($virtualPagesTable->TotalCount()) {
$rootTab->push($tabVirtualPages = new Tab('VirtualPages',
$virtualPagesNote,
$virtualPagesTable
));
}
// Make page location fields read-only if the user doesn't have the appropriate permission // Make page location fields read-only if the user doesn't have the appropriate permission
if(!Permission::check("SITETREE_REORGANISE")) { if(!Permission::check("SITETREE_REORGANISE")) {
$fields->makeFieldReadonly('ParentType'); $fields->makeFieldReadonly('ParentType');