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

Fixed: Add opensurvey into list of reloaded modules for 3.7

Browse Source
This commit is contained in:
Laurent Destailleur 2015-01-07 11:11:40 +01:00
parent 4ee308c77b
commit f8792bdbc7
1 changed files with 154 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
htdocs/install/upgrade2.php
View File

@ -3637,12 +3637,35 @@ function migrate_delete_old_dir($db,$langs,$conf)
* @param DoliDB $db Database handler * @param DoliDB $db Database handler
* @param Translate $langs Object langs * @param Translate $langs Object langs
* @param Conf $conf Object conf * @param Conf $conf Object conf
* @param array $listofmodule List of modules
* @return void * @return void
*/ */
function migrate_reload_modules($db,$langs,$conf) function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
{ {
dolibarr_install_syslog("upgrade2::migrate_reload_modules"); dolibarr_install_syslog("upgrade2::migrate_reload_modules");
// Module to reload if no info is provided
if (count($listofmodule) == 0)
{
$listofmodule=array(
'MAIN_MODULE_AGENDA',
'MAIN_MODULE_SOCIETE',
'MAIN_MODULE_PRODUIT',
'MAIN_MODULE_SERVICE',
'MAIN_MODULE_COMMANDE',
'MAIN_MODULE_FACTURE',
'MAIN_MODULE_FOURNISSEUR',
'MAIN_MODULE_USER',
'MAIN_MODULE_DEPLACEMENT',
'MAIN_MODULE_DON',
'MAIN_MODULE_ECM',
'MAIN_MODULE_PAYBOX',
'MAIN_MODULE_OPENSURVEY'
);
}
foreach($listofmodule as $moduletoreload)
{
if (! empty($conf->global->MAIN_MODULE_AGENDA)) if (! empty($conf->global->MAIN_MODULE_AGENDA))
{ {
dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Agenda"); dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Agenda");
@ -3764,7 +3787,17 @@ function migrate_reload_modules($db,$langs,$conf)
$mod->init('newboxdefonly'); $mod->init('newboxdefonly');
} }
} }
if (! empty($conf->global->MAIN_MODULE_OPENSURVEY)) // Permission has changed into 3.0
{
dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Opensurvey");
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modOpenSurvey.class.php';
if ($res) {
$mod=new modOpenSurvey($db);
$mod->remove('noboxes'); // We need to remove because menu entries has changed
$mod->init('newboxdefonly');
}
}
}
} }