Bug #12446 » 12446_v2.diff
| Classes/Service/Befunc.php (Arbeitskopie) | ||
|---|---|---|
|
if ($GLOBALS['BE_USER']->workspace !== 0) {
|
||
|
$ctrl = t3lib_div::makeInstance('Tx_Workspaces_Controller_PreviewController', FALSE);
|
||
|
$uriBuilder = t3lib_div::makeInstance('Tx_Extbase_MVC_Web_Routing_UriBuilder');
|
||
|
$objectManager = t3lib_div::makeInstance('Tx_Extbase_Object_ObjectManager');
|
||
|
/** @var $uriBuilder Tx_Extbase_MVC_Web_Routing_UriBuilder */
|
||
|
$uriBuilder = $objectManager->create('Tx_Extbase_MVC_Web_Routing_UriBuilder');
|
||
|
/**
|
||
|
* This seems to be very harsh to set this directly to "/typo3 but the viewOnClick also
|
||
|
* has /index.php as fixed value here and dealing with the backPath is very error-prone
|
||
| ... | ... | |
|
$backPath = '/' . TYPO3_mainDir;
|
||
|
// @todo why do we need these additional params? the URIBuilder should add the controller, but he doesn't :(
|
||
|
$additionalParams = '&tx_workspaces_web_workspacesworkspaces%5Bcontroller%5D=Preview&M=web_WorkspacesWorkspaces&id=';
|
||
|
$viewScript = $backPath . $uriBuilder->uriFor('index', array(), $ctrl, 'workspaces', 'web_workspacesworkspaces') . $additionalParams;
|
||
|
$viewScript = $backPath . $uriBuilder->uriFor('index', array(), 'Tx_Workspaces_Controller_PreviewController', 'workspaces', 'web_workspacesworkspaces') . $additionalParams;
|
||
|
}
|
||
|
}
|
||
| Classes/Controller/PreviewController.php (Arbeitskopie) | ||
|---|---|---|
|
$language = intval(t3lib_div::_GP('L'));
|
||
|
$controller = t3lib_div::makeInstance('Tx_Workspaces_Controller_ReviewController', TRUE);
|
||
|
$uriBuilder = t3lib_div::makeInstance('Tx_Extbase_MVC_Web_Routing_UriBuilder');
|
||
|
/** @var $uriBuilder Tx_Extbase_MVC_Web_Routing_UriBuilder */
|
||
|
$uriBuilder = $this->objectManager->create('Tx_Extbase_MVC_Web_Routing_UriBuilder');
|
||
|
$wsSettingsPath = t3lib_div::getIndpEnv('TYPO3_SITE_URL') . 'typo3/';
|
||
|
$wsSettingsUri = $uriBuilder->uriFor('singleIndex', array(), $controller, 'workspaces', 'web_workspacesworkspaces');
|
||
|
$wsSettingsUri = $uriBuilder->uriFor('singleIndex', array(), 'Tx_Workspaces_Controller_ReviewController', 'workspaces', 'web_workspacesworkspaces');
|
||
|
$wsSettingsParams = '&tx_workspaces_web_workspacesworkspaces[controller]=Review';
|
||
|
$wsSettingsUrl = $wsSettingsPath . $wsSettingsUri . $wsSettingsParams;
|
||
| ... | ... | |
|
// @todo - handle new pages here
|
||
|
// branchpoints are not handled anymore because this feature is not supposed anymore
|
||
|
if (tx_Workspaces_Service_Workspaces::isNewPage($this->pageId)) {
|
||
|
$wsNewPageUri = $uriBuilder->uriFor('newPage', array(), $this, 'workspaces', 'web_workspacesworkspaces');
|
||
|
$wsNewPageUri = $uriBuilder->uriFor('newPage', array(), 'Tx_Workspaces_Controller_PreviewController', 'workspaces', 'web_workspacesworkspaces');
|
||
|
$wsNewPageParams = '&tx_workspaces_web_workspacesworkspaces[controller]=Preview';
|
||
|
$this->view->assign('liveUrl', $wsSettingsPath . $wsNewPageUri . $wsNewPageParams);
|
||
|
} else {
|
||
- « Previous
- 1
- 2
- Next »