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

Fix translation of label of cron job.

Browse Source
This commit is contained in:
Laurent Destailleur 2022-08-22 20:31:59 +02:00
parent 6c2a08a457
commit 17a833befc
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
htdocs/cron/card.php
View File

@ -337,7 +337,7 @@ if (($action == "create") || ($action == "edit")) {
print '<tr><td class="fieldrequired titlefieldcreate">';
print $langs->trans('CronLabel')."</td>";
print "<td><input type=\"text\" size=\"30\" name=\"label\" value=\"".$object->label."\" /> ";
print '<td><input type="text" class="width200" name="label" value="'.dol_escape_htmltag($object->label).'"> ';
print "</td>";
print "<td>";
print "</td>";
@ -353,7 +353,7 @@ if (($action == "create") || ($action == "edit")) {
print '<tr class="blockmethod"><td>';
print $langs->trans('CronModule')."</td><td>";
print "<input type=\"text\" class=\"width200\" name=\"module_name\" value=\"".$object->module_name."\" /> ";
print '<input type="text" class="width200" name="module_name" value="'.dol_escape_htmltag($object->module_name).'"> ';
print "</td>";
print "<td>";
print $form->textwithpicto('', $langs->trans("CronModuleHelp"), 1, 'help');
@ -362,7 +362,7 @@ if (($action == "create") || ($action == "edit")) {
print '<tr class="blockmethod"><td>';
print $langs->trans('CronClassFile')."</td><td>";
print '<input type="text" class="minwidth300" name="classesname" value="'.$object->classesname.'" /> ';
print '<input type="text" class="minwidth300" name="classesname" value="'.dol_escape_htmltag($object->classesname).'"> ';
print "</td>";
print "<td>";
print $form->textwithpicto('', $langs->trans("CronClassFileHelp"), 1, 'help');
@ -371,7 +371,7 @@ if (($action == "create") || ($action == "edit")) {
print '<tr class="blockmethod"><td>';
print $langs->trans('CronObject')."</td><td>";
print "<input type=\"text\" class=\"width200\" name=\"objectname\" value=\"".$object->objectname."\" /> ";
print '<input type="text" class="width200" name="objectname" value="'.dol_escape_htmltag($object->objectname).'"> ';
print "</td>";
print "<td>";
print $form->textwithpicto('', $langs->trans("CronObjectHelp"), 1, 'help');
@ -380,7 +380,7 @@ if (($action == "create") || ($action == "edit")) {
print '<tr class="blockmethod"><td>';
print $langs->trans('CronMethod')."</td><td>";
print '<input type="text" class="minwidth300" name="methodename" value="'.$object->methodename.'" /> ';
print '<input type="text" class="minwidth300" name="methodename" value="'.dol_escape_htmltag($object->methodename).'" /> ';
print "</td>";
print "<td>";
print $form->textwithpicto('', $langs->trans("CronMethodHelp"), 1, 'help');
@ -545,8 +545,15 @@ if (($action == "create") || ($action == "edit")) {
$linkback = '<a href="'.DOL_URL_ROOT.'/cron/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
$reg = array();
if (preg_match('/:(.*)$/', $object->label, $reg)) {
$langs->load($reg[1]);
}
$labeltoshow = preg_replace('/:.*$/', '', $object->label);
$morehtmlref = '<div class="refidno">';
$morehtmlref .= $langs->trans($object->label);
$morehtmlref .= $langs->trans($labeltoshow);
$morehtmlref .= '</div>';
dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);

9
htdocs/cron/list.php
View File

@ -489,6 +489,11 @@ if ($num > 0) {
}
}
$reg = array();
if (preg_match('/:(.*)$/', $obj->label, $reg)) {
$langs->load($reg[1]);
}
$object->id = $obj->rowid;
$object->ref = $obj->rowid;
$object->label = preg_replace('/:.*$/', '', $obj->label);
@ -499,10 +504,6 @@ if ($num > 0) {
$object->datestart = $db->jdate($obj->datestart);
$object->dateend = $db->jdate($obj->dateend);
$object->module_name = $obj->module_name;
$reg = array();
if (preg_match('/:(.*)$/', $obj->label, $reg)) {
$langs->load($reg[1]);
}
$datelastrun = $db->jdate($obj->datelastrun);
$datelastresult = $db->jdate($obj->datelastresult);