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

Fix sorting order not loose after generation of image

Browse Source
This commit is contained in:
Laurent Destailleur 2023-03-27 08:49:26 +02:00
parent f5980f2345
commit 92b11c240f
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1457,6 +1457,8 @@ class FormFile
if ($modulepart == 'medias' && !GETPOST('website')) { if ($modulepart == 'medias' && !GETPOST('website')) {
$moreparaminurl .= '&backtourl='.urlencode(DOL_URL_ROOT.'/ecm/index_medias.php?file_manager=1&modulepart='.$modulepart.'&section_dir='.$relativepath); $moreparaminurl .= '&backtourl='.urlencode(DOL_URL_ROOT.'/ecm/index_medias.php?file_manager=1&modulepart='.$modulepart.'&section_dir='.$relativepath);
} }
// Link to convert into webp
if (!preg_match('/\.webp$/i', $file['name'])) {
if ($modulepart == 'medias' && !GETPOST('website')) { if ($modulepart == 'medias' && !GETPOST('website')) {
print '<a href="'.DOL_URL_ROOT.'/ecm/index_medias.php?action=confirmconvertimgwebp&token='.newToken().'&section_dir='.urlencode($relativepath).'&filetoregenerate='.urlencode($fileinfo['basename']).'&module='.$modulepart.$param.$moreparaminurl.'" title="'.dol_escape_htmltag($langs->trans("GenerateChosenImgWebp")).'">'.img_picto('', 'images', 'class="flip marginrightonly"').'</a>'; print '<a href="'.DOL_URL_ROOT.'/ecm/index_medias.php?action=confirmconvertimgwebp&token='.newToken().'&section_dir='.urlencode($relativepath).'&filetoregenerate='.urlencode($fileinfo['basename']).'&module='.$modulepart.$param.$moreparaminurl.'" title="'.dol_escape_htmltag($langs->trans("GenerateChosenImgWebp")).'">'.img_picto('', 'images', 'class="flip marginrightonly"').'</a>';
} elseif ($modulepart == 'medias' && GETPOST('website')) { } elseif ($modulepart == 'medias' && GETPOST('website')) {
@ -1464,6 +1466,7 @@ class FormFile
} }
} }
} }
}
if (!$disablecrop && image_format_supported($file['name']) > 0) { if (!$disablecrop && image_format_supported($file['name']) > 0) {
if ($permtoeditline) { if ($permtoeditline) {
// Link to resize // Link to resize

7
htdocs/core/tpl/filemanager.tpl.php
View File

@ -92,7 +92,7 @@ if ($module == 'ecm') {
print '</a>'; print '</a>';
} }
if ($permtoadd && GETPOSTISSET('website')) { // If on file manager to manage medias of a web site if ($permtoadd && GETPOSTISSET('website')) { // If on file manager to manage medias of a web site
print '<a id="agenerateimgwebp" href="'.$_SERVER["PHP_SELF"].'?action=confirmconvertimgwebp&token='.newToken().'&website='.$website->ref.'" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans("GenerateImgWebp")).'">'; print '<a id="agenerateimgwebp" href="'.$_SERVER["PHP_SELF"].'?action=confirmconvertimgwebp&token='.newToken().'&website='.urlencode($website->ref).'" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans("GenerateImgWebp")).'">';
print img_picto('', 'images', '', false, 0, 0, '', 'size15x flip marginrightonly'); print img_picto('', 'images', '', false, 0, 0, '', 'size15x flip marginrightonly');
print '</a>'; print '</a>';
} elseif ($permtoadd && $module == 'ecm') { // If on file manager medias in ecm } elseif ($permtoadd && $module == 'ecm') { // If on file manager medias in ecm
@ -205,7 +205,10 @@ if ($action == 'confirmconvertimgwebp') {
if ($module == 'medias') { if ($module == 'medias') {
$formquestion['website']=array('type'=>'hidden', 'value'=>$website->ref, 'name'=>'website'); $formquestion['website']=array('type'=>'hidden', 'value'=>$website->ref, 'name'=>'website');
} }
print $form->formconfirm($_SERVER["PHP_SELF"], empty($file) ? $langs->trans('ConfirmImgWebpCreation') : $langs->trans('ConfirmChosenImgWebpCreation'), empty($file) ? $langs->trans('ConfirmGenerateImgWebp') : $langs->trans('ConfirmGenerateChosenImgWebp'), 'convertimgwebp', $formquestion, "yes", 1); $param = '';
if (!empty($sortfield)) $param .= '&sortfield='.urlencode($sortfield);
if (!empty($sortorder)) $param .= '&sortorder='.urlencode($sortorder);
print $form->formconfirm($_SERVER["PHP_SELF"].($param ? '?'.$param : ''), empty($file) ? $langs->trans('ConfirmImgWebpCreation') : $langs->trans('ConfirmChosenImgWebpCreation'), empty($file) ? $langs->trans('ConfirmGenerateImgWebp') : $langs->trans('ConfirmGenerateChosenImgWebp'), 'convertimgwebp', $formquestion, "yes", 1);
$action = 'file_manager'; $action = 'file_manager';
} }

2
htdocs/langs/en_US/ecm.lang
View File

@ -48,7 +48,7 @@ GenerateImgWebp=Duplicate all images with another version with .webp format
ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)... ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
ConfirmImgWebpCreation=Confirm all images duplication ConfirmImgWebpCreation=Confirm all images duplication
GenerateChosenImgWebp=Duplicate chosen image with another version with .webp format GenerateChosenImgWebp=Duplicate chosen image with another version with .webp format
ConfirmGenerateChosenImgWebp=If you confirm, you will generate an image in .webp format for chosen image ConfirmGenerateChosenImgWebp=If you confirm, you will generate an image in .webp format for the image
ConfirmChosenImgWebpCreation=Confirm chosen images duplication ConfirmChosenImgWebpCreation=Confirm chosen images duplication
SucessConvertImgWebp=Images successfully duplicated SucessConvertImgWebp=Images successfully duplicated
SucessConvertChosenImgWebp=Chosen image successfully duplicated SucessConvertChosenImgWebp=Chosen image successfully duplicated