composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-21 09:38:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°2249 - Supportability - Updater module (unified version name)

Browse Source
This commit is contained in:
Eric
2020-01-16 18:13:58 +01:00
parent 4552bc0778
commit 8a1a78444d
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/itopwebpage.class.inc.php
View File

@@ -1166,7 +1166,7 @@ EOF;
}
// Render the revision number
if (ITOP_REVISION == '$WCREV$')
if (ITOP_REVISION == 'svn')
{
// This is NOT a version built using the buil system, just display the main version
$sVersionString = Dict::Format('UI:iTopVersion:Short', ITOP_APPLICATION, ITOP_VERSION);

1
core/config.class.inc.php
View File

@@ -25,6 +25,7 @@ define('ITOP_APPLICATION_SHORT', 'iTop');
define('ITOP_VERSION', '2.7.0-dev');
define('ITOP_REVISION', 'svn');
define('ITOP_BUILD_DATE', '$WCNOW$');
define('ITOP_VERSION_FULL', ITOP_VERSION.'-'.ITOP_REVISION);
define('ACCESS_USER_WRITE', 1);
define('ACCESS_ADMIN_WRITE', 2);

4
setup/runtimeenv.class.inc.php
View File

@@ -174,7 +174,7 @@ class RunTimeEnvironment
ROOT_MODULE => array(
'version_db' => '',
'name_db' => '',
'version_code' => ITOP_VERSION.'.'.ITOP_REVISION,
'version_code' => ITOP_VERSION_FULL,
'name_code' => ITOP_APPLICATION,
)
);
@@ -730,7 +730,7 @@ class RunTimeEnvironment
// Record main installation
$oInstallRec = new ModuleInstallation();
$oInstallRec->Set('name', ITOP_APPLICATION);
$oInstallRec->Set('version', ITOP_VERSION.'-'.ITOP_REVISION);
$oInstallRec->Set('version', ITOP_VERSION_FULL);
$oInstallRec->Set('comment', $sMainComment);
$oInstallRec->Set('parent_id', 0); // root module
$oInstallRec->Set('installed', $iInstallationTime);

6
setup/wizardsteps.class.inc.php
View File

@@ -518,9 +518,9 @@ EOF
$sInstalledVersion = $aInstalledInfo['product_version'];
$sInstalledDataModelVersion = $aInstalledInfo['datamodel_version'];
$oPage->add("<h2>Information about the upgrade from version $sInstalledVersion to ".ITOP_VERSION.'.'.ITOP_REVISION."</h2>");
$oPage->add("<h2>Information about the upgrade from version $sInstalledVersion to ".ITOP_VERSION_FULL."</h2>");
if ($sInstalledVersion == (ITOP_VERSION.'.'.ITOP_REVISION))
if ($sInstalledVersion == ITOP_VERSION_FULL)
{
// Reinstalling the same version let's skip the license agreement...
$bDisplayLicense = false;
@@ -542,7 +542,7 @@ EOF
{
// No compatible version exists... cannot upgrade. Either it is too old, or too new (downgrade !)
$this->bCanMoveForward = false;
$oPage->p("The current version of ".ITOP_APPLICATION." (".ITOP_VERSION.'.'.ITOP_REVISION.") does not seem to be compatible with the installed version ($sInstalledVersion).");
$oPage->p("The current version of ".ITOP_APPLICATION." (".ITOP_VERSION_FULL.") does not seem to be compatible with the installed version ($sInstalledVersion).");
$oPage->p("The upgrade cannot continue, sorry.");
}
else

4
webservices/webservices.basic.php
View File

@@ -41,14 +41,14 @@ class BasicServices extends WebServicesBase
*/
static public function GetVersion()
{
if (ITOP_REVISION == '$WCREV$')
if (ITOP_REVISION == 'svn')
{
$sVersionString = ITOP_VERSION.' [dev]';
}
else
{
// This is a build made from SVN, let display the full information
$sVersionString = ITOP_VERSION."-".ITOP_REVISION." ".ITOP_BUILD_DATE;
$sVersionString = ITOP_VERSION_FULL." ".ITOP_BUILD_DATE;
}
return $sVersionString;