Debug modulebuilder

This commit is contained in:
Laurent Destailleur 2017-08-05 10:35:12 +02:00
parent 402e6bf650
commit 702ecffa3c
2 changed files with 73 additions and 66 deletions

View File

@ -56,4 +56,5 @@ SqlFileExtraFields=Sql file for complementary attributes
SqlFileKey=Sql file for keys SqlFileKey=Sql file for keys
AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
UseAsciiDocFormat=You can use Markdown format, but it is recommanded to use Asciidoc format (Comparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown) UseAsciiDocFormat=You can use Markdown format, but it is recommanded to use Asciidoc format (Comparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
IsAMeasure=Is a measure IsAMeasure=Is a measure
DirScanned=Directory scanned

View File

@ -813,7 +813,7 @@ $h++;
foreach($listofmodules as $tmpmodule => $tmpmodulewithcase) foreach($listofmodules as $tmpmodule => $tmpmodulewithcase)
{ {
$head[$h][0] = $_SERVER["PHP_SELF"].'?module='.$tmpmodulewithcase; $head[$h][0] = $_SERVER["PHP_SELF"].'?module='.$tmpmodulewithcase.($forceddirread?'@'.$dirread:'');
$head[$h][1] = $tmpmodulewithcase; $head[$h][1] = $tmpmodulewithcase;
$head[$h][2] = $tmpmodulewithcase; $head[$h][2] = $tmpmodulewithcase;
$h++; $h++;
@ -958,15 +958,15 @@ elseif (! empty($module))
print $langs->trans("ModuleBuilderDesc".$tab).'<br><br>'; print $langs->trans("ModuleBuilderDesc".$tab).'<br><br>';
print '<span class="fa fa-file"></span> '.$langs->trans("DescriptorFile").' : <strong>'.$pathtofile.'</strong>'; print '<span class="fa fa-file"></span> '.$langs->trans("DescriptorFile").' : <strong>'.$pathtofile.'</strong>';
print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>'; print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
print '<br>'; print '<br>';
print '<span class="fa fa-file"></span> '.$langs->trans("ReadmeFile").' : <strong>'.$pathtofilereadme.'</strong>'; print '<span class="fa fa-file"></span> '.$langs->trans("ReadmeFile").' : <strong>'.$pathtofilereadme.'</strong>';
print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.'&action=editfile&format=markdown&file='.urlencode($pathtofilereadme).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>'; print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=markdown&file='.urlencode($pathtofilereadme).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
print '<br>'; print '<br>';
print '<span class="fa fa-file"></span> '.$langs->trans("ChangeLog").' : <strong>'.$pathtochangelog.'</strong>'; print '<span class="fa fa-file"></span> '.$langs->trans("ChangeLog").' : <strong>'.$pathtochangelog.'</strong>';
print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.'&action=editfile&format=markdown&file='.urlencode($pathtochangelog).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>'; print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=markdown&file='.urlencode($pathtochangelog).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
print '<br>'; print '<br>';
print '<br>'; print '<br>';
@ -974,84 +974,90 @@ elseif (! empty($module))
print_fiche_titre($langs->trans("DescriptorFile")); print_fiche_titre($langs->trans("DescriptorFile"));
print '<div class="underbanner clearboth"></div>'; if (! empty($moduleobj))
print '<div class="fichecenter">'; {
print '<div class="underbanner clearboth"></div>';
print '<div class="fichecenter">';
print '<table class="border centpercent">'; print '<table class="border centpercent">';
print '<tr class="liste_titre"><td class="titlefield">'; print '<tr class="liste_titre"><td class="titlefield">';
print $langs->trans("Parameter"); print $langs->trans("Parameter");
print '</td><td>'; print '</td><td>';
print $langs->trans("Value"); print $langs->trans("Value");
print '</td></tr>'; print '</td></tr>';
print '<tr><td>'; print '<tr><td>';
print $langs->trans("Numero"); print $langs->trans("Numero");
print ' (<a href="https://wiki.dolibarr.org/index.php/List_of_modules_id" target="_blank">'.$langs->trans("SeeHere").'</a>)'; print ' (<a href="https://wiki.dolibarr.org/index.php/List_of_modules_id" target="_blank">'.$langs->trans("SeeHere").'</a>)';
print '</td><td>'; print '</td><td>';
print $moduleobj->numero; print $moduleobj->numero;
print '</td></tr>'; print '</td></tr>';
print '<tr><td>'; print '<tr><td>';
print $langs->trans("Name"); print $langs->trans("Name");
print '</td><td>'; print '</td><td>';
print $moduleobj->getName(); print $moduleobj->getName();
print '</td></tr>'; print '</td></tr>';
print '<tr><td>'; print '<tr><td>';
print $langs->trans("Version"); print $langs->trans("Version");
print '</td><td>'; print '</td><td>';
print $moduleobj->getVersion(); print $moduleobj->getVersion();
print '</td></tr>'; print '</td></tr>';
print '<tr><td>'; print '<tr><td>';
print $langs->trans("Family"); print $langs->trans("Family");
//print "<br>'crm','financial','hr','projects','products','ecm','technic','interface','other'"; //print "<br>'crm','financial','hr','projects','products','ecm','technic','interface','other'";
print '</td><td>'; print '</td><td>';
print $moduleobj->family; print $moduleobj->family;
print '</td></tr>'; print '</td></tr>';
print '<tr><td>'; print '<tr><td>';
print $langs->trans("EditorName"); print $langs->trans("EditorName");
print '</td><td>'; print '</td><td>';
print $moduleobj->editor_name; print $moduleobj->editor_name;
print '</td></tr>'; print '</td></tr>';
print '<tr><td>'; print '<tr><td>';
print $langs->trans("EditorUrl"); print $langs->trans("EditorUrl");
print '</td><td>'; print '</td><td>';
print $moduleobj->editor_url; print $moduleobj->editor_url;
print '</td></tr>'; print '</td></tr>';
print '<tr><td>'; print '<tr><td>';
print $langs->trans("Description"); print $langs->trans("Description");
print '</td><td>'; print '</td><td>';
print $moduleobj->getDesc(); print $moduleobj->getDesc();
print '</td></tr>'; print '</td></tr>';
print '</table>'; print '</table>';
print '<br><br>';
print '<br><br>'; // Readme file
print_fiche_titre($langs->trans("ReadmeFile"));
// Readme file print '<div class="underbanner clearboth"></div>';
print_fiche_titre($langs->trans("ReadmeFile")); print '<div class="fichecenter">';
print '<div class="underbanner clearboth"></div>'; print $moduleobj->getDescLong();
print '<div class="fichecenter">';
print $moduleobj->getDescLong(); print '<br><br>';
print '<br><br>'; // ChangeLog
print_fiche_titre($langs->trans("ChangeLog"));
// ChangeLog print '<div class="underbanner clearboth"></div>';
print_fiche_titre($langs->trans("ChangeLog")); print '<div class="fichecenter">';
print '<div class="underbanner clearboth"></div>'; print $moduleobj->getChangeLog();
print '<div class="fichecenter">';
print $moduleobj->getChangeLog(); print '</div>';
}
print '</div>'; else
{
print $langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module).'<br>';
}
dol_fiche_end(); dol_fiche_end();
} }
@ -1291,7 +1297,7 @@ elseif (! empty($module))
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="addproperty">'; print '<input type="hidden" name="action" value="addproperty">';
print '<input type="hidden" name="tab" value="objects">'; print '<input type="hidden" name="tab" value="objects">';
print '<input type="hidden" name="module" value="'.dol_escape_htmltag($module).'">'; print '<input type="hidden" name="module" value="'.dol_escape_htmltag($module.($forceddirread?'@'.$dirread:'')).'">';
print '<input type="hidden" name="tabobj" value="'.dol_escape_htmltag($tabobj).'">'; print '<input type="hidden" name="tabobj" value="'.dol_escape_htmltag($tabobj).'">';
print '<table class="noborder">'; print '<table class="noborder">';