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

Merge pull request #23519 from comaiteseb/16.0

Browse Source 
correction bug sur le filtre des langues module Emailing
This commit is contained in:
Laurent Destailleur 2023-01-18 23:34:54 +01:00 committed by GitHub
commit 055cecc4e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
htdocs/core/modules/mailings/contacts1.modules.php
View File

@ -122,7 +122,7 @@ class mailing_contacts1 extends MailingTargets
*/ */
public function formFilter() public function formFilter()
{ {
global $langs; global $langs,$conf;
// Load translation files required by the page // Load translation files required by the page
$langs->loadLangs(array("commercial", "companies", "suppliers", "categories")); $langs->loadLangs(array("commercial", "companies", "suppliers", "categories"));
@ -307,11 +307,14 @@ class mailing_contacts1 extends MailingTargets
$s .= ajax_combobox("filter_category_supplier_contact"); $s .= ajax_combobox("filter_category_supplier_contact");
// Choose language // Choose language if multilangue active
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
$formadmin = new FormAdmin($this->db); if (@$conf->global->MAIN_MULTILANGS==1) {
$s .= '<span class="opacitymedium">'.$langs->trans("DefaultLang").':</span> '; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
$s .= $formadmin->select_language($langs->getDefaultLang(1), 'filter_lang', 0, 0, 1, 0, 0, '', 0, 0, 0, null, 1); $formadmin = new FormAdmin($this->db);
$s .= '<span class="opacitymedium">'.$langs->trans("DefaultLang").':</span> ';
$s .= $formadmin->select_language($langs->getDefaultLang(1), 'filter_lang', 0, 0, 1, 0, 0, '', 0, 0, 0, null, 1);
}
return $s; return $s;
} }
@ -409,7 +412,7 @@ class mailing_contacts1 extends MailingTargets
// Filter on language // Filter on language
if (!empty($filter_lang)) { if (!empty($filter_lang)) {
$sql .= " AND sp.default_lang = '".$this->db->escape($filter_lang)."'"; $sql .= " AND sp.default_lang LIKE '".$this->db->escape($filter_lang)."%'";
} }
// Filter on nature // Filter on nature

13
htdocs/core/modules/mailings/thirdparties.modules.php
View File

@ -316,12 +316,13 @@ class mailing_thirdparties extends MailingTargets
$s .= '</select>'; $s .= '</select>';
$s .= ajax_combobox("filter_status_thirdparties"); $s .= ajax_combobox("filter_status_thirdparties");
// Choose language // Choose language if multilangue active
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; if (@$conf->global->MAIN_MULTILANGS==1) {
$formadmin = new FormAdmin($this->db); require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
$s .= '<span class="opacitymedium">'.$langs->trans("DefaultLang").':</span> '; $formadmin = new FormAdmin($this->db);
$s .= $formadmin->select_language($langs->getDefaultLang(1), 'filter_lang_thirdparties', 0, null, 1, 0, 0, '', 0, 0, 0, null, 1); $s .= '<span class="opacitymedium">'.$langs->trans("DefaultLang").':</span> ';
$s .= $formadmin->select_language($langs->getDefaultLang(1), 'filter_lang_thirdparties', 0, null, 1, 0, 0, '', 0, 0, 0, null, 1);
}
return $s; return $s;
} }