Some minor fix in default values and modulebuilder

This commit is contained in:
Laurent Destailleur 2019-02-09 13:40:22 +01:00
parent a916708068
commit 7f4bbcf9a5
4 changed files with 5 additions and 6 deletions

View File

@ -352,7 +352,6 @@ if ($result)
{ {
$obj = $db->fetch_object($result); $obj = $db->fetch_object($result);
print "\n"; print "\n";
print '<tr class="oddeven">'; print '<tr class="oddeven">';
@ -383,10 +382,7 @@ if ($result)
print '</td>'; print '</td>';
} }
if (! empty($conf->multicompany->enabled) && !$user->entity) print '<td></td>';
{
print '<td></td>';
}
// Actions // Actions
print '<td align="center">'; print '<td align="center">';
@ -416,7 +412,6 @@ else
dol_print_error($db); dol_print_error($db);
} }
print '</table>'; print '</table>';
print '</div>'; print '</div>';

View File

@ -100,3 +100,4 @@ UseAboutPage=Disable the about page
UseDocFolder=Disable the documentation folder UseDocFolder=Disable the documentation folder
UseSpecificReadme=Use a specific ReadMe UseSpecificReadme=Use a specific ReadMe
RealPathOfModule=Real path of module RealPathOfModule=Real path of module
ContentCantBeEmpty=Content of file can't be empty

View File

@ -94,6 +94,8 @@ if (empty($newmask)) // This should no happen
if ($dirins && $action == 'initmodule' && $modulename) if ($dirins && $action == 'initmodule' && $modulename)
{ {
$modulename = ucfirst($modulename); // Force first letter in uppercase
if (preg_match('/[^a-z0-9_]/i', $modulename)) if (preg_match('/[^a-z0-9_]/i', $modulename))
{ {
$error++; $error++;
@ -150,6 +152,7 @@ if ($dirins && $action == 'initmodule' && $modulename)
dol_delete_file($destdir.'/img/object_myobject.png'); dol_delete_file($destdir.'/img/object_myobject.png');
dol_delete_file($destdir.'/class/myobject.class.php'); dol_delete_file($destdir.'/class/myobject.class.php');
dol_delete_file($destdir.'/class/api_mymodule.class.php'); dol_delete_file($destdir.'/class/api_mymodule.class.php');
dol_delete_file($destdir.'/doc/*example*');
} }
// Edit PHP files // Edit PHP files