From 52595454c1c3a722a649cc67397d620c8d0c6e77 Mon Sep 17 00:00:00 2001
From: Kevin Ditscheid <kevin.ditscheid@sgalinski.de>
Date: Tue, 12 Feb 2019 16:11:09 +0100
Subject: [PATCH] [BUGFIX] Fix the pagetree page selection
---
Classes/Controller/BackendController.php | 8 ++++----
Resources/Private/Partials/Backend/SelectPage.html | 2 +-
Resources/Public/JavaScript/Backend.js | 7 ++++++-
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/Classes/Controller/BackendController.php b/Classes/Controller/BackendController.php
index 3a56eec..35a4d04 100644
--- a/Classes/Controller/BackendController.php
+++ b/Classes/Controller/BackendController.php
@@ -154,12 +154,12 @@ class BackendController extends ActionController {
$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', '<')) {
- $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
$pageRenderer->loadExtJS();
- $pageRenderer->addJsInlineCode('typo3_version', 'TYPO3.version='
- . VersionNumberUtility::convertVersionNumberToInteger(VersionNumberUtility::getCurrentTypo3Version())
- . ';');
}
$this->docHeaderComponent->setMetaInformation($this->pageInfo);
diff --git a/Resources/Private/Partials/Backend/SelectPage.html b/Resources/Private/Partials/Backend/SelectPage.html
index 5779b08..ebcf27a 100644
--- a/Resources/Private/Partials/Backend/SelectPage.html
+++ b/Resources/Private/Partials/Backend/SelectPage.html
@@ -17,7 +17,7 @@
<f:for each="{pages}" as="page">
<tr data-uid="{page.uid}">
<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}
</f:link.action>
</td>
diff --git a/Resources/Public/JavaScript/Backend.js b/Resources/Public/JavaScript/Backend.js
index 9dfcdd9..b968718 100644
--- a/Resources/Public/JavaScript/Backend.js
+++ b/Resources/Public/JavaScript/Backend.js
@@ -39,6 +39,10 @@ define([
$('#filter-search').val('');
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) {
@@ -60,7 +64,7 @@ define([
} else {
var pageTreeNodes = Viewport.NavigationContainer.PageTree.instance.nodes;
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]);
break;
}
@@ -83,6 +87,7 @@ define([
TYPO3.SgNewsModule = SgNewsModule;
SgNewsModule.init();
+
return SgNewsModule;
});
--
GitLab