tonyair/silverstripe-subsites
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-subsites synced 2024-06-28 23:49:35 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX: Improved linking behavior of links and reverse links. (from r89843) (from r96319)

Browse Source
This commit is contained in:
Tom Rix 2010-03-01 22:26:56 +00:00
parent e7add11e4e
commit ce3688ff89
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/RelatedPageLink.php
View File

@ -82,7 +82,6 @@ class RelatedPageLink extends DataObject {
$url = $page->AbsoluteLink();
return '<a href="' . Convert::raw2att($url) .'" class="externallink">' . Convert::raw2xml($url) . '</a>';
}
function canView($member = null) {

21
code/SiteTreeSubsites.php
View File

@ -190,27 +190,24 @@ class SiteTreeSubsites extends SiteTreeDecorator {
$related->setPermissions(array('add', 'edit', 'delete'));
if($reverse) {
$text = '<p>In addition, this page is marked as related by the following pages: </p><ul>';
$text = '<p>In addition, this page is marked as related by the following pages: </p><p>';
foreach($reverse as $rpage) {
$text .= '<ul><a href="admin/show/' . $rpage->ID . '" class="cmsEditlink">' . $rpage->Title . '</a> '.$rpage->AbsoluteLink().'</ul>';
$text .= $rpage->RelatedPageAdminLink(true) . " - " . $rpage->AbsoluteLink(true) . "<br />\n";
}
$text .= '</ul>';
$text .= '</p>';
$tab->push(new LiteralField('ReverseRelated', $text));
}
}
/**
* Returns the RelatedPageLink objects that are reverse-associated with this page.
*/
function ReverseRelated() {
$return = new DataObjectSet();
$links = DataObject::get('RelatedPageLink', 'RelatedPageID = ' . $this->owner->ID);
if($links) foreach($links as $link) {
if($link->MasterPage()->exists()) {
$return->push($link->MasterPage());
}
}
return $return->Count() > 0 ? $return : false;
return DataObject::get('RelatedPageLink', 'RelatedPageID = ' . $this->owner->ID,'',
"INNER JOIN \"SiteTree\" ON \"SiteTree\".\"ID\" = \"RelatedPageLink\".\"MasterPageID\""
);
}
function NormalRelated() {