lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix use of reposition when nojs for confirmation popup

Browse Source
This commit is contained in:
Laurent Destailleur 2021-12-11 18:13:03 +01:00
parent 2bc417fcf7
commit 689f5dd1fe
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/html.form.class.php
View File

@ -4868,7 +4868,7 @@ class Form
$more .= $moreonecolumn; $more .= $moreonecolumn;
} }
// JQUI method dialog is broken with jmobile, we use standard HTML. // JQUERY method dialog is broken with smartphone, we use standard HTML.
// Note: When using dol_use_jmobile or no js, you must also check code for button use a GET url with action=xxx and check that you also output the confirm code when action=xxx // Note: When using dol_use_jmobile or no js, you must also check code for button use a GET url with action=xxx and check that you also output the confirm code when action=xxx
// See page product/card.php for example // See page product/card.php for example
if (!empty($conf->dol_use_jmobile)) { if (!empty($conf->dol_use_jmobile)) {

4
htdocs/core/class/html.formfile.class.php
View File

@ -1269,7 +1269,7 @@ class FormFile
} }
print '<div class="div-table-responsive-no-min">'; print '<div class="div-table-responsive-no-min">';
print '<table width="100%" id="tablelines" class="liste noborder nobottom">'."\n"; print '<table id="tablelines" class="centpercent liste noborder nobottom">'."\n";
if (!empty($addfilterfields)) { if (!empty($addfilterfields)) {
print '<tr class="liste_titre nodrag nodrop">'; print '<tr class="liste_titre nodrag nodrop">';
@ -1504,7 +1504,7 @@ class FormFile
if (!empty($conf->global->MAIN_ECM_DISABLE_JS)) { if (!empty($conf->global->MAIN_ECM_DISABLE_JS)) {
$useajax = 0; $useajax = 0;
} }
print '<a href="'.((($useinecm && $useinecm != 6) && $useajax) ? '#' : ($url.'?action=deletefile&token='.newToken().'&urlfile='.urlencode($filepath).$param)).'" class="reposition deletefilelink" rel="'.$filepath.'">'.img_delete().'</a>'; print '<a href="'.((($useinecm && $useinecm != 6) && $useajax) ? '#' : ($url.'?action=deletefile&token='.newToken().'&urlfile='.urlencode($filepath).$param)).'" class="'.($useajax ? 'reposition ' : '').'deletefilelink" rel="'.$filepath.'">'.img_delete().'</a>';
} }
print "</td>"; print "</td>";

2
htdocs/core/tpl/document_actions_post_headers.tpl.php
View File

@ -74,7 +74,7 @@ if ($action == 'deletefile') {
$langs->trans('ConfirmDeleteFile'), $langs->trans('ConfirmDeleteFile'),
'confirm_deletefile', 'confirm_deletefile',
'', '',
0, '',
1 1
); );
} }