Skip to content
Snippets Groups Projects
Commit 52595454 authored by Kevin Ditscheid's avatar Kevin Ditscheid
Browse files

[BUGFIX] Fix the pagetree page selection

parent f60ef0ef
No related branches found
No related tags found
1 merge request!8Feature upgrade to9 lts
...@@ -154,12 +154,12 @@ class BackendController extends ActionController { ...@@ -154,12 +154,12 @@ class BackendController extends ActionController {
$currentLanguageInfo = $languageOptions[$this->language] ?? NULL; $currentLanguageInfo = $languageOptions[$this->language] ?? NULL;
} }
$pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
$pageRenderer->addJsInlineCode('typo3_version', 'TYPO3.version='
. VersionNumberUtility::convertVersionNumberToInteger(VersionNumberUtility::getCurrentTypo3Version())
. ';');
if (version_compare(VersionNumberUtility::getCurrentTypo3Version(), '9.0.0', '<')) { if (version_compare(VersionNumberUtility::getCurrentTypo3Version(), '9.0.0', '<')) {
$pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
$pageRenderer->loadExtJS(); $pageRenderer->loadExtJS();
$pageRenderer->addJsInlineCode('typo3_version', 'TYPO3.version='
. VersionNumberUtility::convertVersionNumberToInteger(VersionNumberUtility::getCurrentTypo3Version())
. ';');
} }
$this->docHeaderComponent->setMetaInformation($this->pageInfo); $this->docHeaderComponent->setMetaInformation($this->pageInfo);
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<f:for each="{pages}" as="page"> <f:for each="{pages}" as="page">
<tr data-uid="{page.uid}"> <tr data-uid="{page.uid}">
<td nowrap="nowrap" class="col-title"> <td nowrap="nowrap" class="col-title">
<f:link.action action="index" additionalParams="{id: page.uid, returnUrl: returnUrl}"> <f:link.action class="sg-news_pageswitch" action="index" additionalParams="{id: page.uid, returnUrl: returnUrl}" additionalAttributes="{data-page: page.uid, data-path: page.path}">
<sg:backend.recordIcon table="pages" row="{page}" clickMenu="0" /> {page._thePathFull} <sg:backend.recordIcon table="pages" row="{page}" clickMenu="0" /> {page._thePathFull}
</f:link.action> </f:link.action>
</td> </td>
......
...@@ -39,6 +39,10 @@ define([ ...@@ -39,6 +39,10 @@ define([
$('#filter-search').val(''); $('#filter-search').val('');
this.form.submit(); this.form.submit();
}); });
$('.sg-news_pageswitch').on('click', function(event) {
event.preventDefault();
SgNewsModule.goTo('web_SgNewsNews', event.target.dataset.page, event.target.dataset.path);
});
}, },
goTo: function(module, id, path) { goTo: function(module, id, path) {
...@@ -60,7 +64,7 @@ define([ ...@@ -60,7 +64,7 @@ define([
} else { } else {
var pageTreeNodes = Viewport.NavigationContainer.PageTree.instance.nodes; var pageTreeNodes = Viewport.NavigationContainer.PageTree.instance.nodes;
for (var nodeIndex in pageTreeNodes) { for (var nodeIndex in pageTreeNodes) {
if (pageTreeNodes.hasOwnProperty(nodeIndex) && pageTreeNodes[nodeIndex].identifier === id) { if (pageTreeNodes.hasOwnProperty(nodeIndex) && pageTreeNodes[nodeIndex].identifier === parseInt(id)) {
Viewport.NavigationContainer.PageTree.selectNode(pageTreeNodes[nodeIndex]); Viewport.NavigationContainer.PageTree.selectNode(pageTreeNodes[nodeIndex]);
break; break;
} }
...@@ -83,6 +87,7 @@ define([ ...@@ -83,6 +87,7 @@ define([
TYPO3.SgNewsModule = SgNewsModule; TYPO3.SgNewsModule = SgNewsModule;
SgNewsModule.init(); SgNewsModule.init();
return SgNewsModule; return SgNewsModule;
}); });
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment