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

FIX Only template of enabled modules visible

Browse Source
This commit is contained in:
Laurent Destailleur 2020-10-20 15:54:08 +02:00
parent ef182bed07
commit 4ec4801c77
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/admin/mails_templates.php
View File

@ -429,7 +429,7 @@ if ($action == 'delete')
} }
$sql = "SELECT rowid as rowid, label, type_template, lang, fk_user, private, position, topic, joinfiles, content_lines, content, enabled, active"; $sql = "SELECT rowid as rowid, module, label, type_template, lang, fk_user, private, position, topic, joinfiles, content_lines, content, enabled, active";
$sql .= " FROM ".MAIN_DB_PREFIX."c_email_templates"; $sql .= " FROM ".MAIN_DB_PREFIX."c_email_templates";
$sql .= " WHERE entity IN (".getEntity('email_template').")"; $sql .= " WHERE entity IN (".getEntity('email_template').")";
if (!$user->admin) if (!$user->admin)
@ -779,6 +779,13 @@ if ($resql)
print "</tr>\n"; print "</tr>\n";
} else { } else {
if ($obj->module) {
$tempmodulekey = $obj->module;
if (empty($conf->$tempmodulekey) || empty($conf->$tempmodulekey->enabled)) {
$i++;
continue;
}
}
$keyforobj = 'type_template'; $keyforobj = 'type_template';
if (!in_array($obj->$keyforobj, array_keys($elementList))) if (!in_array($obj->$keyforobj, array_keys($elementList)))
{ {