From 4a5614b01eccdbd5fdceab750abbd8dc45d5a3a6 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Mon, 13 Jan 2014 11:11:06 +0100
Subject: [PATCH] no-jira: fix 7.1.1 upgrader which works only if portfolio
enabled, and never set has completed
---
.../java/org/olat/upgrade/OLATUpgrade_7_1_1.java | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/olat/upgrade/OLATUpgrade_7_1_1.java b/src/main/java/org/olat/upgrade/OLATUpgrade_7_1_1.java
index fbdc4267294..1af8bb4423b 100644
--- a/src/main/java/org/olat/upgrade/OLATUpgrade_7_1_1.java
+++ b/src/main/java/org/olat/upgrade/OLATUpgrade_7_1_1.java
@@ -101,17 +101,16 @@ public class OLATUpgrade_7_1_1 extends OLATUpgrade {
if (uhd.isInstallationComplete()) return false;
}
- if(!(portfolioCourseNodeEnabled && epfModule.isEnabled())) return false;
-
- // get template maps with invalid references and fix them
- fixInvalidMapReferences(upgradeManager, uhd);
-
- // remove invalid references on db
- fixInvalidTemplateMaps(upgradeManager, uhd);
+ if((portfolioCourseNodeEnabled && epfModule.isEnabled())) {
+ // get template maps with invalid references and fix them
+ fixInvalidMapReferences(upgradeManager, uhd);
+ // remove invalid references on db
+ fixInvalidTemplateMaps(upgradeManager, uhd);
+ }
migrateSecurityGroups(upgradeManager, uhd);
-// uhd.setInstallationComplete(true);
+ uhd.setInstallationComplete(true);
upgradeManager.setUpgradesHistory(uhd, VERSION);
log.audit("Finished OLATUpgrade_7_1_1 successfully!");
return true;
--
GitLab