From a18aff1c56a044aba9a9d105f22418978054d01c Mon Sep 17 00:00:00 2001
From: Mike McKay <mfmckay@wustl.edu>
Date: Thu, 19 May 2016 18:26:39 -0500
Subject: [PATCH] A couple updates to get site configuration preferences the
new way.
---
.../org/nrg/xnat/helpers/prearchive/PrearcDatabase.java | 8 +-------
.../turbine/modules/screens/XDATScreen_UpdateUser.java | 9 +++------
2 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/nrg/xnat/helpers/prearchive/PrearcDatabase.java b/src/main/java/org/nrg/xnat/helpers/prearchive/PrearcDatabase.java
index 1b359a7e..6523ee70 100644
--- a/src/main/java/org/nrg/xnat/helpers/prearchive/PrearcDatabase.java
+++ b/src/main/java/org/nrg/xnat/helpers/prearchive/PrearcDatabase.java
@@ -17,7 +17,6 @@ import org.apache.commons.lang3.StringUtils;
import org.nrg.action.ClientException;
import org.nrg.automation.entities.Script;
import org.nrg.automation.services.ScriptService;
-import org.nrg.config.exceptions.ConfigServiceException;
import org.nrg.dicomtools.filters.DicomFilterService;
import org.nrg.dicomtools.filters.SeriesImportFilter;
import org.nrg.framework.constants.PrearchiveCode;
@@ -179,12 +178,7 @@ public final class PrearcDatabase {
if (preferences != null) {
return preferences.getPrearchivePath();
}
- try {
- final Properties properties = XDAT.getSiteConfiguration();
- return properties.getProperty("prearchivePath");
- } catch (ConfigServiceException e) {
- return null;
- }
+ return XDAT.getSiteConfigPreferences().getPrearchivePath();
}
private static boolean tableExists() throws Exception {
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_UpdateUser.java b/src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_UpdateUser.java
index bbe5853c..9f08bc2e 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_UpdateUser.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_UpdateUser.java
@@ -17,7 +17,6 @@ import org.apache.turbine.services.velocity.TurbineVelocity;
import org.apache.turbine.util.RunData;
import org.apache.velocity.context.Context;
import org.apache.velocity.tools.generic.EscapeTool;
-import org.nrg.config.exceptions.ConfigServiceException;
import org.nrg.xdat.XDAT;
import org.nrg.xdat.display.DisplayManager;
import org.nrg.xdat.security.helpers.Users;
@@ -26,7 +25,6 @@ import org.nrg.xdat.turbine.modules.screens.SecureScreen;
import org.nrg.xdat.turbine.utils.AccessLogger;
import org.nrg.xdat.turbine.utils.AdminUtils;
import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.XFT;
import org.nrg.xft.security.UserI;
import java.sql.SQLException;
@@ -54,10 +52,9 @@ public class XDATScreen_UpdateUser extends SecureScreen {
c.put("showReason", XDAT.getSiteConfigPreferences().getShowChangeJustification());
c.put("requireReason", XDAT.getSiteConfigPreferences().getRequireChangeJustification());
- try{
- c.put("siteConfig", XDAT.getSiteConfiguration());
- }catch(ConfigServiceException ignored){
- }
+
+ c.put("siteConfig", XDAT.getSiteConfigPreferences());
+
doBuildTemplate(data, c);
}
--
GitLab