FIX mailing destination list title (#34929)
* Fix mailing destination list title * Some more fix on checkbox column * $conf->main_checkbox_left_column is available in V21.0.3 * Right selector has less option the left selector. --------- Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
This commit is contained in:
parent
0804ebe08a
commit
90bc3d74e7
1 changed files with 10 additions and 3 deletions
|
|
@ -857,7 +857,7 @@ if ($object->fetch($id) >= 0) {
|
|||
print '</td>';
|
||||
|
||||
// Action column
|
||||
if (empty($conf->main_checkbox_left_column)) {
|
||||
if (!$conf->main_checkbox_left_column) {
|
||||
print '<td class="liste_titre maxwidthsearch">';
|
||||
$searchpicto = $form->showFilterButtons();
|
||||
print $searchpicto;
|
||||
|
|
@ -914,7 +914,7 @@ if ($object->fetch($id) >= 0) {
|
|||
print '<tr class="oddeven">';
|
||||
|
||||
// Action column
|
||||
if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
|
||||
if ($conf->main_checkbox_left_column) {
|
||||
print '<td class="center nowraponall">';
|
||||
print '<!-- ID mailing_cibles = '.$obj->rowid.' -->';
|
||||
if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
|
||||
|
|
@ -998,9 +998,16 @@ if ($object->fetch($id) >= 0) {
|
|||
print '</td>';
|
||||
|
||||
// Action column
|
||||
if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
|
||||
if (!$conf->main_checkbox_left_column) {
|
||||
print '<td class="center nowraponall">';
|
||||
print '<!-- ID mailing_cibles = '.$obj->rowid.' -->';
|
||||
if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
|
||||
$selected = 0;
|
||||
if (in_array($obj->rowid, $arrayofselected)) {
|
||||
$selected = 1;
|
||||
}
|
||||
print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
|
||||
}
|
||||
if ($obj->status == $object::STATUS_DRAFT) { // If status of target line is not sent yet
|
||||
if ($user->hasRight('mailing', 'creer')) {
|
||||
print '<a class="reposition marginleftonly" href="'.$_SERVER['PHP_SELF'].'?action=delete&token='.newToken().'&rowid='.((int) $obj->rowid).$param.'">'.img_delete($langs->trans("RemoveRecipient")).'</a>';
|
||||
|
|
|
|||
Loading…
Reference in a new issue