From c45898f30897d0d168081492e98b6128e99b7b7b Mon Sep 17 00:00:00 2001
From: Timm Fitschen <timm.fitschen@ds.mpg.de>
Date: Tue, 4 Dec 2018 13:39:16 +0100
Subject: [PATCH] MAINT: removed hard coded admin email
---
caosdb-webui | 2 +-
src/main/java/caosdb/server/CaosDBServer.java | 7 +------
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/caosdb-webui b/caosdb-webui
index 2a6d74d7..7df3c8cd 160000
--- a/caosdb-webui
+++ b/caosdb-webui
@@ -1 +1 @@
-Subproject commit 2a6d74d7cb6bed89b2e7a0e5801ff4c040a3ebf8
+Subproject commit 7df3c8cdf945e5b98df8b04a084fabbdaf058946
diff --git a/src/main/java/caosdb/server/CaosDBServer.java b/src/main/java/caosdb/server/CaosDBServer.java
index d52b6e15..c5ab6286 100644
--- a/src/main/java/caosdb/server/CaosDBServer.java
+++ b/src/main/java/caosdb/server/CaosDBServer.java
@@ -277,17 +277,12 @@ public class CaosDBServer extends Application {
// Create an application (this class).
final Application application = new CaosDBServer();
- application.getStatusService().setContactEmail("timm.fitschen@ds.mpg.de");
+ application.getStatusService().setContactEmail(getServerProperty(ServerProperties.KEY_ADMIN_EMAIL));
application
.getStatusService()
.setHomeRef(new Reference(getServerProperty(ServerProperties.KEY_CONTEXT_ROOT) + "/"));
// Attach the application to the component with a defined contextRoot.
- application.getStatusService().setContactEmail("timm.fitschen@ds.mpg.de");
- application
- .getStatusService()
- .setHomeRef(new Reference(getServerProperty(ServerProperties.KEY_CONTEXT_ROOT) + "/"));
-
component
.getDefaultHost()
.attach(getServerProperty(ServerProperties.KEY_CONTEXT_ROOT), application);
--
GitLab