Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-03 07:32:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Debug v22 - Removed conflict code with old dolopenpopup architecture

Browse Source
This commit is contained in:
ldestailleur
2025-06-25 12:29:11 +02:00
parent d828828bef
commit 8c88eab05c
12 changed files with 2 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
htdocs/core/lib/functions.lib.php
View File

@@ -2782,24 +2782,6 @@ function dolButtonToOpenUrlInDialogPopup($name, $label, $buttonstring, $url, $di
$out = '';
/* canceled
$backtopagejsfieldsid = '';
$backtopagejsfieldslabel = '';
$backtopagejsfieldshtml = '';
if ($backtopagejsfields) {
$tmpbacktopagejsfields = explode(':', $backtopagejsfields);
if (empty($tmpbacktopagejsfields[1])) { // If the part 'keyforpopupid:' is missing, we add $name for it.
$tmp2backtopagejsfields = explode(',', $tmpbacktopagejsfields[0]);
} else {
$tmp2backtopagejsfields = explode(',', $tmpbacktopagejsfields[1]);
}
$backtopagejsfieldsid = empty($tmp2backtopagejsfields[0]) ? '' : $tmp2backtopagejsfields[0];
$backtopagejsfieldslabel = empty($tmp2backtopagejsfields[1]) ? '' : $tmp2backtopagejsfields[1];
$backtopagejsfieldshtml = empty($tmp2backtopagejsfields[2]) ? '' : $tmp2backtopagejsfields[2];
$url .= '&backtopagejsfields='.urlencode($backtopagejsfields);
}
*/
//print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("MediaFiles")).'" name="file_manager">';
$out .= '<!-- a link for button to open url into a dialog popup -->';
$out .= '<a '.($accesskey ? ' accesskey="'.$accesskey.'"' : '').' class="cursorpointer reposition button_'.$name.($morecss ? ' '.$morecss : '').'"'.$disabled.' title="'.dol_escape_htmltag($label).'"';
@@ -2816,12 +2798,7 @@ function dolButtonToOpenUrlInDialogPopup($name, $label, $buttonstring, $url, $di
// Add code to open url using the popup.
$out .= '<!-- code to open popup and variables to retrieve returned variables -->';
$out .= '<div id="idfordialog'.$name.'" class="hidden">'.(getDolGlobalInt('MAIN_OPTIMIZEFORTEXTBROWSER') < 2 ? 'div for dialog' : '').'</div>';
/* canceled
// Add also hidden field to retrieve the returned variables
$out .= '<div id="varforreturndialogid'.$name.'" class="hidden">'.(getDolGlobalInt('MAIN_OPTIMIZEFORTEXTBROWSER') < 2 ? 'div for returned id' : '').'</div>';
$out .= '<div id="varforreturndialoglabel'.$name.'" class="hidden">'.(getDolGlobalInt('MAIN_OPTIMIZEFORTEXTBROWSER') < 2 ? 'div for returned label' : '').'</div>';
$out .= '<div id="varforreturndialoghtml'.$name.'" class="hidden">'.(getDolGlobalInt('MAIN_OPTIMIZEFORTEXTBROWSER') < 2 ? 'div for returned html' : '').'</div>';
*/
$out .= '<!-- Add js code to open dialog popup on dialog -->';
$out .= '<script nonce="'.getNonce().'" type="text/javascript">
jQuery(document).ready(function () {