tonyair/silverstripe-widgets
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-widgets synced 2024-06-26 14:29:26 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '1.1' into 1.2

Browse Source
This commit is contained in:
Daniel Hensby 2017-01-25 13:29:00 +00:00
commit 1bbaba52e0
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
2 changed files with 132 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
code/controller/WidgetContentControllerExtension.php
View File

@ -26,15 +26,18 @@ class WidgetContentControllerExtension extends Extension
* @return RequestHandler * @return RequestHandler
*/ */
public function handleWidget() public function handleWidget()
{ {$SQL_id = $this->owner->getRequest()->param('ID');
$SQL_id = $this->owner->getRequest()->param('ID'); if(!$SQL_id) {return false;
if (!$SQL_id) { }
return false; /** @var SiteTree $widgetOwner */
$widgetOwner = $this->owner->data();
while($widgetOwner->InheritSideBar && $widgetOwner->Parent()->exists()){
$widgetOwner = $widgetOwner->Parent();
} }
// find WidgetArea relations // find WidgetArea relations
$widgetAreaRelations = array(); $widgetAreaRelations = array();
$hasOnes = $this->owner->data()->hasOne(); $hasOnes = $widgetOwner->hasOne();
if(!$hasOnes) { if(!$hasOnes) {
return false; return false;
@ -54,7 +57,7 @@ class WidgetContentControllerExtension extends Extension
break; break;
} }
$widget = $this->owner->data()->$widgetAreaRelation()->Widgets() $widget = $widgetOwner->$widgetAreaRelation()->Widgets()
->filter('ID', $SQL_id) ->filter('ID', $SQL_id)
->First(); ->First();
} }

39
code/controller/WidgetController.php
View File

@ -54,19 +54,38 @@ class WidgetController extends Controller
$id = ($this->widget) ? $this->widget->ID : null; $id = ($this->widget) ? $this->widget->ID : null;
$segment = Controller::join_links('widget', $id, $action); $segment = Controller::join_links('widget', $id, $action);
if ($page = Director::get_current_page()) { $page = Director::get_current_page();
return $page->Link($segment); if($page && !($page instanceof WidgetController)) {return $page->Link($segment);
} }
return Controller::curr()->Link($segment); if ($controller = $this->getParentController()) {return $controller->Link($segment);
}
return $segment;
}
/**
* Cycles up the controller stack until it finds a non-widget controller
* This is needed becauseController::currreturns the widget controller,
* which means anyLinkfunction turns into endless loop.
*
* @return Controller
*/
public function getParentController()
{
foreach(Controller::$controller_stack as $controller) {
if (!($controller instanceof WidgetController)) {
return $controller;
}
}
return false;
} }
/** /**
* @return Widget * @return Widget
*/ */
public function getWidget() public function getWidget()
{ {return $this->widget;
return $this->widget;
} }
/** /**
@ -76,8 +95,7 @@ class WidgetController extends Controller
* @return string HTML * @return string HTML
*/ */
public function Content() public function Content()
{ {return $this->renderWith(array_reverse(ClassInfo::ancestry($this->widget->class)));
return $this->renderWith(array_reverse(ClassInfo::ancestry($this->widget->class)));
} }
/** /**
@ -87,8 +105,7 @@ class WidgetController extends Controller
* @return string HTML * @return string HTML
*/ */
public function WidgetHolder() public function WidgetHolder()
{ {return $this->renderWith("WidgetHolder");
return $this->renderWith("WidgetHolder");
} }
/** /**
@ -99,12 +116,10 @@ class WidgetController extends Controller
* *
* @return string HTML * @return string HTML
*/ */
public function editablesegment() public function editablesegment() {
{
// use left and main to set the html config // use left and main to set the html config
$leftandmain = LeftAndMain::create(); $leftandmain = LeftAndMain::create();
$leftandmain->init(); $leftandmain->init();
$className = $this->urlParams['ID']; $className = $this->urlParams['ID'];
if (class_exists('Translatable') && Member::currentUserID()) { if (class_exists('Translatable') && Member::currentUserID()) {
// set current locale based on logged in user's locale // set current locale based on logged in user's locale