Making widgets able to be used in a non page controller

This commit is contained in:
John Milmine 2015-11-11 15:01:03 +13:00
parent 17c94ff9ce
commit 0f207180b4

View File

@ -50,13 +50,35 @@ class WidgetController extends Controller {
*/
public function Link($action = null) {
$id = ($this->widget) ? $this->widget->ID : null;
$segment = Controller::join_links('widget', $id, $action);
if($page = Director::get_current_page()) {
$page = Director::get_current_page();
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 because Controller::curr returns the widget controller,
* which means any Link function turns into endless loop.
*
* @return Controller
*/
public function getParentController() {
foreach(Controller::$controller_stack as $controller) {
if (!($controller instanceof WidgetController)) {
return $controller;
}
}
return false;
}
/**