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

Merge branch '2.0' into 2.1

Browse Source
This commit is contained in:
Dylan Wagstaff 2018-07-05 09:49:11 +12:00
commit 75b851326d
4 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/en/technical.md
View File

@ -28,5 +28,5 @@ This method is called when a pages are being copied between the main site or ano
### alternateAbsoluteLink
This method modifies the absolute link to contain the valid subsite domain
### alternatePreviewLink
### updatePreviewLink
This method modifies the preview link for the CMS.

2
javascript/LeftAndMain_Subsites.js
View File

@ -101,7 +101,7 @@
/**
* Update links and forms with GET/POST SubsiteID param, so we remaing on the current subsite.
* The initial link for the iframe comes from SiteTreeSubsites::alternatePreviewLink.
* The initial link for the iframe comes from SiteTreeSubsites::updatePreviewLink.
*
* This is done so we can use the CMS domain for displaying previews so we prevent single-origin
* violations and SSL cert problems that come up when iframing content from a different URL.

2
src/Extensions/LeftAndMainSubsites.php
View File

@ -160,7 +160,7 @@ class LeftAndMainSubsites extends LeftAndMainExtension
$output->push(ArrayData::create([
'CurrentState' => $currentState,
'ID' => $subsite->ID,
'Title' => Convert::raw2xml($subsite->Title)
'Title' => $subsite->Title,
]));
}

43
src/Extensions/SiteTreeSubsites.php
View File

@ -273,8 +273,10 @@ class SiteTreeSubsites extends DataExtension
* - Is in a group which has access to the subsite this page belongs to
* - Is in a group with edit permissions on the "main site"
*
* @param null $member
* @return bool
* If there are no subsites configured yet, this logic is skipped.
*
* @param Member|null $member
* @return bool|null
*/
public function canEdit($member = null)
{
@ -282,6 +284,11 @@ class SiteTreeSubsites extends DataExtension
$member = Security::getCurrentUser();
}
// Do not provide any input if there are no subsites configured
if (!Subsite::get()->exists()) {
return null;
}
// Find the sites that this user has access to
$goodSites = Subsite::accessible_sites('CMS_ACCESS_CMSMain', true, 'all', $member)->column('ID');
@ -329,8 +336,8 @@ class SiteTreeSubsites extends DataExtension
}
/**
* @param null $member
* @return bool
* @param Member|null $member
* @return bool|null
*/
public function canPublish($member = null)
{
@ -375,17 +382,31 @@ class SiteTreeSubsites extends DataExtension
/**
* Use the CMS domain for iframed CMS previews to prevent single-origin violations
* and SSL cert problems.
* @param null $action
* and SSL cert problems. Always set SubsiteID to avoid errors because a page doesn't
* exist on the CMS domain.
*
* @param string &$link
* @param string|null $action
* @return string
*/
public function updatePreviewLink(&$link, $action = null)
{
$url = Director::absoluteURL($this->owner->Link($action));
$link = HTTP::setGetVar('SubsiteID', $this->owner->SubsiteID, $url);
return $link;
}
/**
* This function is marked as deprecated for removal in 5.0.0 in silverstripe/cms
* so now simply passes execution to where the functionality exists for backwards compatiblity.
*
* @param string|null $action
* @return string
*/
public function alternatePreviewLink($action = null)
{
$url = Director::absoluteURL($this->owner->Link());
if ($this->owner->SubsiteID) {
$url = HTTP::setGetVar('SubsiteID', $this->owner->SubsiteID, $url);
}
return $url;
$link = '';
return $this->updatePreviewLink($link, $action);
}
/**