dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[+] CORE : Module properly upgraded with message even if no file upgrade file exist, add 'upgrade' button

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13551 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
vSchoener
2012-02-23 11:02:35 +00:00
parent a7dfcd06f1
commit 2a760a56b4
6 changed files with 123 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Module.php
+45 -8
View File
@@ -307,7 +307,8 @@ abstract class ModuleCore
);
// Need Upgrade will check and load upgrade file to the moduleCache upgrade case detail
return Module::isInstalled($module_name) && Module::needUpgrade($module_name, $module_version);
$ret = Module::isInstalled($module_name) && Module::needUpgrade($module_name, $module_version);
return $ret;
}
/**
@@ -350,17 +351,29 @@ abstract class ModuleCore
}
$upgrade['number_upgrade_left'] = count($upgrade['upgrade_file_left']);
// Update module version in DB with the last succeed upgrade
if ($upgrade['upgraded_to'])
Db::getInstance()->execute('
UPDATE `'._DB_PREFIX_.'module` m
SET m.version = \''.bqSQL($upgrade['upgraded_to']).'\'
WHERE m.name = \''.bqSQL($this->name).'\'');
Module::upgradeModuleVersion($this->name, $upgrade['upgraded_to']);
$this->setUpgradeMessage($upgrade);
return $upgrade;
}
/**
* Upgrade the registered version to a new one
*
* @static
* @param $name
* @param $version
* @return bool
*/
public static function upgradeModuleVersion($name, $version)
{
return Db::getInstance()->execute('
UPDATE `'._DB_PREFIX_.'module` m
SET m.version = \''.bqSQL($version).'\'
WHERE m.name = \''.bqSQL($name).'\'');
}
/**
* Check if a module need to be upgraded.
* This method modify the module_cache adding an upgrade list file
@@ -377,6 +390,7 @@ abstract class ModuleCore
WHERE m.`name` = \''.bqSQL($module_name).'\'');
self::$modules_cache[$module_name]['upgrade']['upgraded_from'] = $registered_version;
Tools::alignVersionNumber($module_version, $registered_version);
// Check the version of the module with the registered one and look if any upgrade file exist
return version_compare($module_version, $registered_version, '>')
&& Module::loadUpgradeVersionList($module_name, $module_version, $registered_version);
@@ -388,6 +402,7 @@ abstract class ModuleCore
*
* @static
* @param $module_name
* @param $module_version
* @param $registered_version
* @return bool to know directly if any files have been found
*/
@@ -402,10 +417,12 @@ abstract class ModuleCore
{
// Read each file name
foreach ($files as $file)
if (!in_array($file, array('.', '..', '.svn')))
if (!in_array($file, array('.', '..', '.svn', 'index.php')))
{
$tab = explode('-', $file);
$file_version = basename($tab[1], '.php');
Tools::alignVersionNumber($file_version, $module_version);
Tools::alignVersionNumber($file_version, $registered_version);
// Compare version, if minor than actual, we need to upgrade the module
if (count($tab) == 2 &&
(version_compare($file_version, $module_version, '<=') &&
@@ -417,7 +434,14 @@ abstract class ModuleCore
'upgrade_function' => 'upgrade_module_'.str_replace('.', '_', $file_version));
}
}
}
}
// No files upgrade, then upgrade succeed
if (count($list) == 0)
{
self::$modules_cache[$module_name]['upgrade']['success'] = true;
Module::upgradeModuleVersion($module_name, $module_version);
}
// Set the list to module cache
self::$modules_cache[$module_name]['upgrade']['upgrade_file_left'] = $list;
@@ -425,6 +449,19 @@ abstract class ModuleCore
return (bool)count($list);
}
/**
* Return the status of the upgraded module
*
* @static
* @param $module_name
* @return bool
*/
public static function getUpgradeStatus($module_name)
{
return (isset(self::$modules_cache[$module_name]) &&
self::$modules_cache[$module_name]['upgrade']['success']);
}
/**
* Delete module from datable
*