|
@@ -120,10 +120,10 @@ if ($action == 'updateMask') {
|
|
|
$file = ''; $classname = ''; $filefound = 0;
|
|
|
$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
|
|
|
foreach ($dirmodels as $reldir) {
|
|
|
- $file = dol_buildpath($reldir."core/modules/mymodule/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
|
|
|
+ $file = dol_buildpath($reldir."core/modules/recruitment/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
|
|
|
if (file_exists($file)) {
|
|
|
$filefound = 1;
|
|
|
- $classname = "pdf_".$modele;
|
|
|
+ $classname = "pdf_".$modele."_".strtolower($tmpobjectkey);
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
@@ -134,7 +134,7 @@ if ($action == 'updateMask') {
|
|
|
$module = new $classname($db);
|
|
|
|
|
|
if ($module->write_file($tmpobject, $langs) > 0) {
|
|
|
- header("Location: ".DOL_URL_ROOT."/document.php?modulepart=".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
|
|
|
+ header("Location: ".DOL_URL_ROOT."/document.php?modulepart=recruitment-".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
|
|
|
return;
|
|
|
} else {
|
|
|
setEventMessages($module->error, null, 'errors');
|
|
@@ -501,7 +501,8 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
|
|
|
// Preview
|
|
|
print '<td class="center">';
|
|
|
if ($module->type == 'pdf') {
|
|
|
- print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'&object='.$myTmpObjectKey.'">'.img_object($langs->trans("Preview"), 'generic').'</a>';
|
|
|
+ $newname = preg_replace('/_'.preg_quote(strtolower($myTmpObjectKey), '/').'/', '', $name);
|
|
|
+ print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.urlencode($newname).'&object='.urlencode($myTmpObjectKey).'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
|
|
|
} else {
|
|
|
print img_object($langs->trans("PreviewNotAvailable"), 'generic');
|
|
|
}
|