[BUGFIX] History service does not show details anymore

The history service in the workspace module does not contain
any details for modified records.

There are two things that result in this behaviour:
* the history service works on the live record and automatically
  resolves the workspace version
* the security fix in #42696 introduces a permission check for
  pages (which is -1 if using the workspace version directly)

Thus, the reference to the live record needs to be used instead.

Change-Id: Idd46531d2f54ef56691f1464f6dfb892549fbf8a
Fixes: #44225
Releases: 6.0, 6.1
Reviewed-on: https://review.typo3.org/17275
Reviewed-by: Mattias Nilsson
Reviewed-by: Oliver Hader
Tested-by: Oliver Hader

diff --git a/typo3/sysext/workspaces/Classes/ExtDirect/ExtDirectServer.php b/typo3/sysext/workspaces/Classes/ExtDirect/ExtDirectServer.php
index b1847f0..aa6c89e 100644 (file)
--- a/typo3/sysext/workspaces/Classes/ExtDirect/ExtDirectServer.php
+++ b/typo3/sysext/workspaces/Classes/ExtDirect/ExtDirectServer.php
@@ -84,7 +84,7 @@ class ExtDirectServer extends \TYPO3\CMS\Workspaces\ExtDirect\AbstractHandler {
        public function getHistory($parameters) {
                /** @var $historyService \TYPO3\CMS\Workspaces\Service\HistoryService */
                $historyService = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Workspaces\\Service\\HistoryService');
-               $history = $historyService->getHistory($parameters->table, $parameters->versionId);
+               $history = $historyService->getHistory($parameters->table, $parameters->liveId);
                return array(
                        'data' => $history,
                        'total' => count($history)

diff --git a/typo3/sysext/workspaces/Resources/Public/JavaScript/configuration.js b/typo3/sysext/workspaces/Resources/Public/JavaScript/configuration.js
index b036ade..a541779 100644 (file)
--- a/typo3/sysext/workspaces/Resources/Public/JavaScript/configuration.js
+++ b/typo3/sysext/workspaces/Resources/Public/JavaScript/configuration.js
@@ -338,6 +338,7 @@ TYPO3.Workspaces.Configuration.RowButtons = {
                                var record = TYPO3.Workspaces.MainStore.getAt(rowIndex);
                                TYPO3.Workspaces.Helpers.getHistoryWindow({
                                        table: record.json.table,
+                                       liveId: record.json.t3ver_oid,
                                        versionId: record.json.uid
                                });
                        }

diff --git a/typo3/sysext/workspaces/Resources/Public/JavaScript/helpers.js b/typo3/sysext/workspaces/Resources/Public/JavaScript/helpers.js
index 8673a28..4c0b6a3 100644 (file)
--- a/typo3/sysext/workspaces/Resources/Public/JavaScript/helpers.js
+++ b/typo3/sysext/workspaces/Resources/Public/JavaScript/helpers.js
@@ -162,6 +162,7 @@ TYPO3.Workspaces.Helpers = {
                                                listeners: {
                                                        beforeload: function(store, options) {
                                                                store.setBaseParam('table', configuration.table);
+                                                               store.setBaseParam('liveId', configuration.liveId);
                                                                store.setBaseParam('versionId', configuration.versionId);
                                                        }
                                                }