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

@ -57,3 +57,4 @@ 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,6 +974,8 @@ elseif (! empty($module))
print_fiche_titre($langs->trans("DescriptorFile")); print_fiche_titre($langs->trans("DescriptorFile"));
if (! empty($moduleobj))
{
print '<div class="underbanner clearboth"></div>'; print '<div class="underbanner clearboth"></div>';
print '<div class="fichecenter">'; print '<div class="fichecenter">';
@ -1030,7 +1032,6 @@ elseif (! empty($module))
print '</table>'; print '</table>';
print '<br><br>'; print '<br><br>';
// Readme file // Readme file
@ -1052,6 +1053,11 @@ elseif (! empty($module))
print $moduleobj->getChangeLog(); 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">';