From 4a479c593071526b17522f3e61dac677991eb10c Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Thu, 26 Apr 2018 16:02:08 +0200
Subject: [PATCH] Moving the list of displayable countries to config file

---
 .../vips/logic/controller/session/UserBean.java  | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/java/no/nibio/vips/logic/controller/session/UserBean.java b/src/main/java/no/nibio/vips/logic/controller/session/UserBean.java
index bc2e135e..25ca99b4 100755
--- a/src/main/java/no/nibio/vips/logic/controller/session/UserBean.java
+++ b/src/main/java/no/nibio/vips/logic/controller/session/UserBean.java
@@ -721,14 +721,18 @@ public class UserBean {
         }
     }
     
-    // TODO: Put in config file?
-    private final static String[] USER_COUNTRY_CODES = {"NO","SE","BA","LV","US"};
-    
     public List<Country> getUserCountries()
     {
-        return em.createNamedQuery("Country.findByCountryCodes")
-                .setParameter("countryCodes",Arrays.asList(UserBean.USER_COUNTRY_CODES))
-                .getResultList();
+        try
+        {
+            return em.createNamedQuery("Country.findByCountryCodes")
+                    .setParameter("countryCodes",Arrays.asList(System.getProperty("no.nibio.vips.logic.USER_COUNTRY_CODES").split(",")))
+                    .getResultList();
+        }
+        catch(NullPointerException ex)
+        {
+            return new ArrayList<>();
+        }
     }
 
     public List<OrganizationGroup> getOrganizationGroups(Organization organization) {
-- 
GitLab