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

Qual: On renomme gestionnaire menu default en rodolphe

Browse Source
This commit is contained in:
Laurent Destailleur 2007-11-11 22:26:11 +00:00
parent 8cd55600eb
commit fb0a9a5b6c
5 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/html.form.class.php
View File

@ -528,7 +528,9 @@ class Form
$filelib=eregi_replace('\.php$','',$file); $filelib=eregi_replace('\.php$','',$file);
$prefix=''; $prefix='';
if (eregi('^eldy',$file)) $prefix='0'; // Recommanded if (eregi('^eldy',$file)) $prefix='0'; // Recommanded
else if (eregi('^auguria',$file)) $prefix='2'; // Other
else if (eregi('^default',$file)) $prefix='2'; // Other else if (eregi('^default',$file)) $prefix='2'; // Other
else if (eregi('^rodolphe',$file)) $prefix='2'; // Other
else if (eregi('^empty',$file)) $prefix='2'; // Other else if (eregi('^empty',$file)) $prefix='2'; // Other
else $prefix='1'; // Experimental else $prefix='1'; // Experimental

0
htdocs/includes/menus/barre_left/default.php → htdocs/includes/menus/barre_left/rodolphe.php
View File

0
htdocs/includes/menus/barre_top/default.php → htdocs/includes/menus/barre_top/rodolphe.php
View File

33
htdocs/install/upgrade2.php
View File

@ -168,8 +168,6 @@ if (isset($_POST['action']) && $_POST['action'] == 'upgrade')
migrate_paiementfourn_facturefourn($db,$langs,$conf); migrate_paiementfourn_facturefourn($db,$langs,$conf);
migrate_delete_old_files($db,$langs,$conf);
// Script pour V2.1 -> V2.2 // Script pour V2.1 -> V2.2
migrate_paiements_orphelins_1($db,$langs,$conf); migrate_paiements_orphelins_1($db,$langs,$conf);
@ -177,6 +175,8 @@ if (isset($_POST['action']) && $_POST['action'] == 'upgrade')
migrate_links_transfert($db,$langs,$conf); migrate_links_transfert($db,$langs,$conf);
migrate_delete_old_files($db,$langs,$conf);
// On commit dans tous les cas. // On commit dans tous les cas.
// La procédure etant conçue pour pouvoir passer plusieurs fois quelquesoit la situation. // La procédure etant conçue pour pouvoir passer plusieurs fois quelquesoit la situation.
$db->commit(); // FIXME $db->commit(); // FIXME
@ -1414,17 +1414,26 @@ function migrate_delete_old_files($db,$langs,$conf)
{ {
$result=true; $result=true;
$filetodelete=DOL_DOCUMENT_ROOT.'/includes/triggers/interface_demo.class.php'; // List of files to delete
//print '<b>'.$filetodelete."</b><br>\n"; $filetodeletearray=array(
if (file_exists($filetodelete)) DOL_DOCUMENT_ROOT.'/includes/triggers/interface_demo.class.php',
DOL_DOCUMENT_ROOT.'/includes/menus/barre_left/default.php',
DOL_DOCUMENT_ROOT.'/includes/menus/barre_top/default.php'
);
foreach ($filetodeletearray as $filetodelete)
{ {
$result=dol_delete_file($filetodelete); //print '<b>'.$filetodelete."</b><br>\n";
} if (file_exists($filetodelete))
if (! $result) {
{ $result=dol_delete_file($filetodelete);
$langs->load("errors"); }
print '<div class="error">'.$langs->trans("Error").': '.$langs->trans("ErrorFailToDeleteFile",$filetodelete); if (! $result)
print ' '.$langs->trans("RemoveItManuallyAndPressF5ToContinue").'</div>'; {
$langs->load("errors");
print '<div class="error">'.$langs->trans("Error").': '.$langs->trans("ErrorFailToDeleteFile",$filetodelete);
print ' '.$langs->trans("RemoveItManuallyAndPressF5ToContinue").'</div>';
}
} }
return $result; return $result;
} }

5
mysql/migration/2.1.0-2.2.0.sql
View File

@ -59,6 +59,11 @@ update llx_const set name='MAIN_MAIL_EMAIL_FROM' where name='NOTIFICATION_EMAIL_
update llx_const set visible=0 where name in ('MAIN_UPLOAD_DOC','MAIN_MAIL_SMTP_SERVER','MAIN_MAIL_SMTP_PORT','MAIN_MAIL_EMAIL_FROM'); update llx_const set visible=0 where name in ('MAIN_UPLOAD_DOC','MAIN_MAIL_SMTP_SERVER','MAIN_MAIL_SMTP_PORT','MAIN_MAIL_EMAIL_FROM');
update llx_const set value='rodolphe.php' where name='MAIN_MENU_BARRELEFT' and value='default.php';
update llx_const set value='rodolphe.php' where name='MAIN_MENU_BARRETOP' and value='default.php';
update llx_const set value='rodolphe.php' where name='MAIN_MENUFRONT_BARRELEFT' and value='default.php';
update llx_const set value='rodolphe.php' where name='MAIN_MENUFRONT_BARRETOP' and value='default.php';
delete from llx_adherent_type where libelle IS NULL; delete from llx_adherent_type where libelle IS NULL;
alter table llx_adherent_type modify libelle varchar(50) NOT NULL; alter table llx_adherent_type modify libelle varchar(50) NOT NULL;