From 6d0d80b7744eb7bff482ecc56ccbbb8e9621eeab Mon Sep 17 00:00:00 2001
From: gnaegi <none@none>
Date: Fri, 18 May 2018 16:51:23 +0200
Subject: [PATCH] OO-3476 fix order of portrait and homepage delete as
preparation for export
---
.../java/org/olat/user/DisplayPortraitManager.java | 12 +++++++-----
.../org/olat/user/HomePageConfigManagerImpl.java | 7 +++++++
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/olat/user/DisplayPortraitManager.java b/src/main/java/org/olat/user/DisplayPortraitManager.java
index 7f4f383b724..d56a2732ecf 100644
--- a/src/main/java/org/olat/user/DisplayPortraitManager.java
+++ b/src/main/java/org/olat/user/DisplayPortraitManager.java
@@ -376,11 +376,13 @@ public class DisplayPortraitManager implements UserDataDeletable {
}
return folder;
}
-
- /**
- * Delete home-page config-file of a certain user.
- * @see org.olat.user.UserDataDeletable#deleteUserData(org.olat.core.id.Identity)
- */
+
+ @Override
+ public int deleteUserDataPriority() {
+ // must have higher priority than HomePageConfigManagerImpl
+ return 650;
+ }
+
@Override
public void deleteUserData(Identity identity, String newDeletedUserName, File archivePath) {
String userHomePage = FolderConfig.getCanonicalRoot() + FolderConfig.getUserHomePage(identity.getName());
diff --git a/src/main/java/org/olat/user/HomePageConfigManagerImpl.java b/src/main/java/org/olat/user/HomePageConfigManagerImpl.java
index f187cc3af65..384ee5244b6 100644
--- a/src/main/java/org/olat/user/HomePageConfigManagerImpl.java
+++ b/src/main/java/org/olat/user/HomePageConfigManagerImpl.java
@@ -146,6 +146,13 @@ public class HomePageConfigManagerImpl extends BasicManager implements HomePageC
return userHomePage;
}
+
+ @Override
+ public int deleteUserDataPriority() {
+ // must have lower priority than DisplayPortraitManager (otherwise portrait archive does not work)
+ return 600;
+ }
+
/**
* Delete home-page config-file of a certain user.
* @see org.olat.user.UserDataDeletable#deleteUserData(org.olat.core.id.Identity)
--
GitLab