mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
d3d6ae833d
API CHANGE Changed Translatable schema from auxilliary tables (SiteTree_lang, SiteTree_lang_Live) to automatically filtered records on the original table (SiteTree, SiteTree_Live), using $Lang and $OriginalID properties. Incompatible update to old schema, migration script is in the works. API CHANGE Removed Translatable::get_one(), Translatable::write() ENHANCEMENT Simplified Translatable tree generation by using getSiteTreeFor() in CMSMain->createtranslation() ENHANCEMENT Added AllChildrenIncludingDeleted(), augmentNumChildrenCountQuery(), augmentAllChildrenIncludingDeleted(), augmentStageChildren() to Translatable class to allow for more stable tree generation. ENHANCEMENT Moved definition of Translatable schema from augmentDatabase() to Translatable->extraStatics() ENHANCEMENT Changes to the CMS language selection refresh the whole admin interface instead of the tree only. This way we can add a URL parameter ?lang=<lang> to /admin, which makes the specific language bookmarkable and reloadable. Changes to LangSelector.js ENHANCEMENT Added fallback to ModelAsController->getNestedController() to fetch page with matching URLSegment but different language in case no page is found in the current language. ENHANCEMENT Added helper methods to Translatable: getTranslation(), hasTranslation(), isTranslation(), findOriginalIDs() ENHANCEMENT Getters and setters for Translatable->getOriginalPage() etc. ENHANCEMENT Hooking Translatable into ModelAsController and ContentController initialization in order to call choose_site_lang() ENHANCEMENT Simplified Translatable->augmentSQL(), augmentWrite() by not using auxilliary tables ENHANCEMENT Showing clickable links for Translations in Translatable->updateCMSFields() BUGFIX Modifying Hierarchy/SiteTree Children getters to accept optional "context" which can be used to set a language explicitly through the $Lang property, rather than implicitly reyling on the static Translatable::current_lang() BUGFIX Fixed TranslatableTest to work with new datamodel BUGFIX Temporarily disabled cookie/session selection in Translatable::choose_site_lang() until we have a good test suite for the side effects. MINOR Added "untranslated" CSS styles to tree nodes and marking them as inactive/grey git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@69959 467b73ca-7a2a-4603-9d3b-597d59a354a9
110 lines
3.2 KiB
PHP
110 lines
3.2 KiB
PHP
<?php
|
|
/**
|
|
* ModelAsController will hand over all control to the appopriate model object
|
|
* It uses URLSegment to determine the right object. Also, if (ModelClass)_Controller exists,
|
|
* that controller will be used instead. It should be a subclass of ContentController.
|
|
*
|
|
* @package sapphire
|
|
*/
|
|
class ModelAsController extends Controller implements NestedController {
|
|
|
|
public function handleRequest($request) {
|
|
$this->pushCurrent();
|
|
$this->urlParams = $request->allParams();
|
|
|
|
$this->init();
|
|
$result = $this->getNestedController();
|
|
|
|
if(is_object($result) && $result instanceOf RequestHandler) {
|
|
$result = $result->handleRequest($request);
|
|
}
|
|
|
|
$this->popCurrent();
|
|
return $result;
|
|
}
|
|
|
|
public function init() {
|
|
singleton('SiteTree')->extend('modelascontrollerInit', $this);
|
|
|
|
Director::set_site_mode('site');
|
|
}
|
|
|
|
public function getNestedController() {
|
|
if($this->urlParams['URLSegment']) {
|
|
$SQL_URLSegment = Convert::raw2sql($this->urlParams['URLSegment']);
|
|
$child = SiteTree::get_by_url($SQL_URLSegment);
|
|
|
|
// fallback to default language
|
|
// @todo Migrate into extension point and module
|
|
if(!$child && Translatable::is_enabled()) {
|
|
$child = Translatable::get_one_by_lang('SiteTree', Translatable::default_lang(), "URLSegment = '{$SQL_URLSegment}'");
|
|
}
|
|
|
|
if(!$child) {
|
|
if($child = $this->findOldPage($SQL_URLSegment)) {
|
|
$url = Controller::join_links(
|
|
Director::baseURL(),
|
|
$child->URLSegment,
|
|
$this->urlParams['Action'],
|
|
$this->urlParams['ID'],
|
|
$this->urlParams['OtherID']
|
|
);
|
|
|
|
$response = new HTTPResponse();
|
|
$response->redirect($url, 301);
|
|
return $response;
|
|
}
|
|
|
|
$child = $this->get404Page();
|
|
}
|
|
|
|
if($child) {
|
|
if(isset($_REQUEST['debug'])) Debug::message("Using record #$child->ID of type $child->class with URL {$this->urlParams['URLSegment']}");
|
|
|
|
$controllerClass = "{$child->class}_Controller";
|
|
|
|
if($this->urlParams['Action'] && ClassInfo::exists($controllerClass.'_'.$this->urlParams['Action'])) {
|
|
$controllerClass = $controllerClass.'_'.$this->urlParams['Action'];
|
|
}
|
|
|
|
if(ClassInfo::exists($controllerClass)) {
|
|
$controller = new $controllerClass($child);
|
|
} else {
|
|
$controller = $child;
|
|
}
|
|
|
|
return $controller;
|
|
} else {
|
|
return new HTTPResponse("The requested page couldn't be found.",404);
|
|
}
|
|
|
|
} else {
|
|
user_error("ModelAsController not geting a URLSegment. It looks like the site isn't redirecting to home", E_USER_ERROR);
|
|
}
|
|
}
|
|
|
|
protected function findOldPage($urlSegment) {
|
|
$versionedQuery = new SQLQuery (
|
|
'"RecordID"', '"SiteTree_versions"',
|
|
"\"WasPublished\" AND \"URLSegment\" = '$urlSegment'",
|
|
'"LastEdited" DESC, "WasPublished"',
|
|
null, null, 1
|
|
);
|
|
|
|
$result = $versionedQuery->execute();
|
|
|
|
if($result->numRecords() == 1 && $redirectPage = $result->nextRecord()) {
|
|
if($redirectObj = DataObject::get_by_id('SiteTree', $redirectPage['RecordID'])) return $redirectObj;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
protected function get404Page() {
|
|
if($page = DataObject::get_one("ErrorPage", "\"ErrorCode\" = '404'")) return $page;
|
|
else return DataObject::get_one("SiteTree", "\"URLSegment\" = '404'");
|
|
}
|
|
}
|
|
|
|
?>
|