From ad216d7348d9cce3060220cd3c8089c584a07d58 Mon Sep 17 00:00:00 2001
From: "Conrado @ VGS" <cmaggi@vgsglobal.com>
Date: Thu, 22 Feb 2018 10:48:42 +0100
Subject: [PATCH] Fix for #845 - Move the modules upgrade to the end of the
migration process
---
modules/Migration/schema/540_to_600RC.php | 36 -----------------------
modules/Migration/schema/600_to_610.php | 22 --------------
modules/Migration/schema/660_to_700.php | 3 --
modules/Migration/schema/701_to_710.php | 3 --
modules/Migration/views/Index.php | 13 ++++++++
5 files changed, 13 insertions(+), 64 deletions(-)
diff --git a/modules/Migration/schema/540_to_600RC.php b/modules/Migration/schema/540_to_600RC.php
index 2701ca42a..1589d10ba 100644
--- a/modules/Migration/schema/540_to_600RC.php
+++ b/modules/Migration/schema/540_to_600RC.php
@@ -16,42 +16,6 @@ vimport('~~modules/com_vtiger_workflow/VTEntityMethodManager.inc');
vimport('~~include/Webservices/Utils.php');
vimport('~~modules/Users/Users.php');
-if(defined('VTIGER_UPGRADE')) {
- //Collating all module package updates here
- updateVtlibModule('Import', 'packages/vtiger/mandatory/Import.zip');
- updateVtlibModule('MailManager', 'packages/vtiger/mandatory/MailManager.zip');
- updateVtlibModule('Mobile', 'packages/vtiger/mandatory/Mobile.zip');
- updateVtlibModule('ModTracker', 'packages/vtiger/mandatory/ModTracker.zip');
- updateVtlibModule('Services', "packages/vtiger/mandatory/Services.zip");
- updateVtlibModule('ServiceContracts', "packages/vtiger/mandatory/ServiceContracts.zip");
- updateVtlibModule('WSAPP', 'packages/vtiger/mandatory/WSAPP.zip');
- updateVtlibModule('Assets', 'packages/vtiger/optional/Assets.zip');
- updateVtlibModule('CustomerPortal', 'packages/vtiger/optional/CustomerPortal.zip');
- updateVtlibModule('ModComments', "packages/vtiger/optional/ModComments.zip");
- updateVtlibModule('Projects', "packages/vtiger/optional/Projects.zip");
- updateVtlibModule('RecycleBin', 'packages/vtiger/optional/RecycleBin.zip');
- updateVtlibModule('SMSNotifier', "packages/vtiger/optional/SMSNotifier.zip");
- updateVtlibModule("Webforms","packages/vtiger/optional/Webforms.zip");
- installVtlibModule('Google', 'packages/vtiger/optional/Google.zip');
- installVtlibModule('EmailTemplates', 'packages/vtiger/optional/EmailTemplates.zip');
-
- // updated language packs.
-
- updateVtlibModule('PT Brasil', 'packages/vtiger/optional/BrazilianLanguagePack_bz_bz.zip');
- updateVtlibModule('British English', 'packages/vtiger/optional/BritishLanguagePack_br_br.zip');
- updateVtlibModule('Dutch', 'packages/vtiger/optional/Dutch.zip');
- updateVtlibModule('Deutsch', 'packages/vtiger/optional/Deutsch.zip');
- updateVtlibModule('French', 'packages/vtiger/optional/French.zip');
- updateVtlibModule('Hungarian', 'packages/vtiger/optional/Hungarian.zip');
- updateVtlibModule('Mexican Spanish', 'packages/vtiger/optional/MexicanSpanishLanguagePack_es_mx.zip');
- updateVtlibModule('Spanish', 'packages/vtiger/optional/Spanish.zip');
- installVtlibModule('Italian', 'packages/vtiger/optional/ItalianLanguagePack_it_it.zip');
- installVtlibModule('RomanianLanguagePack_rm_rm', 'packages/vtiger/optional/RomanianLanguagePack_rm_rm.zip');
- installVtlibModule('Turkce', 'packages/vtiger/optional/TurkishLanguagePack_tr_tr.zip');
- installVtlibModule('Russian', 'packages/vtiger/optional/Russian.zip');
- installVtlibModule('Polish', 'packages/vtiger/optional/PolishLanguagePack_pl_pl.zip');
- installVtlibModule('Russian', 'packages/vtiger/optional/Russian.zip');
-}
if(!defined('INSTALLATION_MODE')) {
Migration_Index_View::ExecuteQuery('ALTER TABLE com_vtiger_workflows ADD COLUMN filtersavedinnew int(1)', array());
diff --git a/modules/Migration/schema/600_to_610.php b/modules/Migration/schema/600_to_610.php
index 57bbf3497..01397ddfd 100644
--- a/modules/Migration/schema/600_to_610.php
+++ b/modules/Migration/schema/600_to_610.php
@@ -13,28 +13,6 @@ chdir(dirname(__FILE__) . '/../../../');
include_once 'modules/com_vtiger_workflow/VTTaskManager.inc';
include_once 'include/utils/utils.php';
-if(defined('VTIGER_UPGRADE')) {
- //Collating all module package updates here
- updateVtlibModule('Import', 'packages/vtiger/mandatory/Import.zip');
- updateVtlibModule('PBXManager', 'packages/vtiger/mandatory/PBXManager.zip');
- updateVtlibModule('MailManager', 'packages/vtiger/mandatory/MailManager.zip');
- updateVtlibModule('Mobile', 'packages/vtiger/mandatory/Mobile.zip');
- updateVtlibModule('ModTracker', 'packages/vtiger/mandatory/ModTracker.zip');
- updateVtlibModule('ServiceContracts', 'packages/vtiger/mandatory/ServiceContracts.zip');
- updateVtlibModule('Services', 'packages/vtiger/mandatory/Services.zip');
- updateVtlibModule('WSAPP', 'packages/vtiger/mandatory/WSAPP.zip');
- updateVtlibModule('Arabic_ar_ae', 'packages/vtiger/optional/Arabic_ar_ae.zip');
- updateVtlibModule('Assets', 'packages/vtiger/optional/Assets.zip');
- updateVtlibModule('EmailTemplates', 'packages/vtiger/optional/EmailTemplates.zip');
- updateVtlibModule('Google', 'packages/vtiger/optional/Google.zip');
- updateVtlibModule('ModComments', 'packages/vtiger/optional/ModComments.zip');
- updateVtlibModule('Projects', 'packages/vtiger/optional/Projects.zip');
- updateVtlibModule('RecycleBin', 'packages/vtiger/optional/RecycleBin.zip');
- updateVtlibModule('SMSNotifier', "packages/vtiger/optional/SMSNotifier.zip");
- updateVtlibModule("Sweden_sv_se","packages/vtiger/optional/Sweden_sv_se.zip");
- updateVtlibModule("Webforms","packages/vtiger/optional/Webforms.zip");
- installVtlibModule('ExtensionStore', 'packages/vtiger/marketplace/ExtensionStore.zip');
-}
if(defined('INSTALLATION_MODE')) {
// Set of task to be taken care while specifically in installation mode.
}
diff --git a/modules/Migration/schema/660_to_700.php b/modules/Migration/schema/660_to_700.php
index 46d364dd0..6989e0df8 100644
--- a/modules/Migration/schema/660_to_700.php
+++ b/modules/Migration/schema/660_to_700.php
@@ -2228,9 +2228,6 @@ if(defined('VTIGER_UPGRADE')) {
rename('modules/Vtiger/resources', 'modules/Vtiger/resources_650');
}
- //Update existing package modules
- Install_Utils_Model::installModules();
-
//recalculate user files to finish
RecalculateSharingRules();
diff --git a/modules/Migration/schema/701_to_710.php b/modules/Migration/schema/701_to_710.php
index f0b0c03c2..7e6050243 100644
--- a/modules/Migration/schema/701_to_710.php
+++ b/modules/Migration/schema/701_to_710.php
@@ -176,8 +176,5 @@ if (defined('VTIGER_UPGRADE')) {
}
//END::Google calendar sync settings
- //Update existing package modules
- Install_Utils_Model::installModules();
-
echo '<br>Succecssfully vtiger version updated to <b>7.1.0</b><br>';
}
diff --git a/modules/Migration/views/Index.php b/modules/Migration/views/Index.php
index 8304d97f7..31f3c9f28 100644
--- a/modules/Migration/views/Index.php
+++ b/modules/Migration/views/Index.php
@@ -128,6 +128,19 @@ class Migration_Index_View extends Vtiger_View_Controller {
}
}
+
+ if(defined('VTIGER_UPGRADE')) {
+
+ echo "<table class='config-table'><tr><th><span><b><font color='red'> Upgrading Modules -- Starts. </font></b></span></th></tr></table>";
+ echo "<table class='config-table'>";
+
+ //Update existing package modules
+ Install_Utils_Model::installModules();
+
+ echo "<table class='config-table'><tr><th><span><b><font color='red'>Upgrading Modules -- Ends.</font></b></span></th></tr></table>";
+
+ }
+
//update vtiger version in db
$migrationModuleModel->updateVtigerVersion();
// To carry out all the necessary actions after migration
--
GitLab