Commit b4262b4f authored by Michael Oehlhof's avatar Michael Oehlhof Committed by Anja Leichsenring
Browse files

[BUGFIX] Browse for records in edit document popup works again

When editing a group in the edit document popup the browse for records
button was without function, this is now fixed.

Resolves: #65215
Releases: master
Change-Id: I1bed83669d8a62f193f6b92d3fd3a39f5250707f
Reviewed-on: http://review.typo3.org/37089


Reviewed-by: default avatarMarkus Klein <klein.t3@reelworx.at>
Reviewed-by: Wouter Wolters's avatarWouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters's avatarWouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Anja Leichsenring's avatarAnja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring's avatarAnja Leichsenring <aleichsenring@ab-softlab.de>
parent dc7fa6a8
......@@ -485,12 +485,12 @@ class BackendController {
$dateFormat = ($GLOBALS['TYPO3_CONF_VARS']['SYS']['USdateFormat'] ? array('MM-DD-YYYY', 'HH:mm MM-DD-YYYY') : array('DD-MM-YYYY', 'HH:mm DD-MM-YYYY'));
$this->pageRenderer->addInlineSetting('DateTimePicker', 'DateFormat', $dateFormat);
// define the window size of the element browser etc.
$popupWindowWidth = 700;
$popupWindowHeight = 750;
$popupWindowSize = trim($GLOBALS['BE_USER']->getTSConfigVal('options.popupWindowSize'));
if (!empty($popupWindowSize)) {
list($popupWindowWidth, $popupWindowHeight) = GeneralUtility::trimExplode('x', $popupWindowSize);
list($popupWindowWidth, $popupWindowHeight) = GeneralUtility::intExplode('x', $popupWindowSize);
}
$popupWindowWidth = !empty($popupWindowWidth) ? (int)$popupWindowWidth : 700;
$popupWindowHeight = !empty($popupWindowHeight) ? (int)$popupWindowHeight : 750;
// define the window size of the popups within the RTE
$rtePopupWindowSize = trim($GLOBALS['BE_USER']->getTSConfigVal('options.rte.popupWindowSize'));
......
......@@ -660,7 +660,21 @@ class EditDocumentController {
}
}
';
// define the window size of the element browser
$popupWindowWidth = 700;
$popupWindowHeight = 750;
$popupWindowSize = trim($GLOBALS['BE_USER']->getTSConfigVal('options.popupWindowSize'));
if (!empty($popupWindowSize)) {
list($popupWindowWidth, $popupWindowHeight) = GeneralUtility::intExplode('x', $popupWindowSize);
}
$t3Configuration = array(
'PopupWindow' => array(
'width' => $popupWindowWidth,
'height' => $popupWindowHeight
),
);
$this->doc->JScode = $this->doc->wrapScriptTags('
TYPO3.configuration = ' . json_encode($t3Configuration) . ';
// Object: TS:
// passwordDummy and decimalSign are used by tbe_editor.js and have to be declared here as
// TS object overwrites the object declared in tbe_editor.js
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment