hsarback/database/data.sql | ●●●●● patch | view | raw | blame | history | |
hsarback/src/de/hsadmin/mods/dom/DomainModuleImpl.java | ●●●●● patch | view | raw | blame | history | |
hsarback/src/de/hsadmin/remote/DomainRemote.java | ●●●●● patch | view | raw | blame | history | |
hsarback/test/de/hsadmin/remote/DomainTest.java | ●●●●● patch | view | raw | blame | history |
hsarback/database/data.sql
@@ -155,6 +155,6 @@ -- table: domain_option -- INSERT INTO domain_option (domain_option_name) VALUES ('graylisting'); VALUES ('greylisting'); INSERT INTO domain_option (domain_option_name) VALUES ('htdocsfallback'); hsarback/src/de/hsadmin/mods/dom/DomainModuleImpl.java
@@ -159,9 +159,6 @@ DomainOption.class.getAnnotation(javax.persistence.Entity.class).name() + " opt WHERE opt.name=:optName"); Set<DomainOption> domainOptions = updatedDom.getDomainOptions(); // if (domainOptions == null) { // updatedDom.setDomainOptions(oldDom.getDomainOptions()); // } for (DomainOption opt : domainOptions) { q.setParameter("optName", opt.getName()); List<?> list = q.getResultList(); hsarback/src/de/hsadmin/remote/DomainRemote.java
@@ -43,8 +43,11 @@ } List<String> domainOptionsList = new ArrayList<String>(); resultMap.put("domainoptions", domainOptionsList); for (DomainOption opt : dom.getDomainOptions()) { domainOptionsList.add(opt.getName()); Set<DomainOption> domainOptions = dom.getDomainOptions(); if (domainOptions != null) { for (DomainOption opt : domainOptions) { domainOptionsList.add(opt.getName()); } } } hsarback/test/de/hsadmin/remote/DomainTest.java
@@ -155,7 +155,7 @@ Map<String, Object> setParams = new HashMap<String, Object>(); Map<String, String> whereParams = new HashMap<String, String>(); List<String> optionslist = new ArrayList<String>(); optionslist.add("graylisting"); optionslist.add("greylisting"); setParams.put("domainoptions", optionslist); whereParams.put("name", "example01.org"); Object[] params = new Object[] { user, @@ -177,7 +177,7 @@ Map<String, String> whereParams = new HashMap<String, String>(); List<String> optionslist = new ArrayList<String>(); optionslist.add("htdocsfallback"); optionslist.add("graylisting"); optionslist.add("greylisting"); setParams.put("domainoptions", optionslist); whereParams.put("name", "example01.org"); Object[] params = new Object[] { user, @@ -244,7 +244,7 @@ Object[] result = (Object[]) execute; assertEquals(result.length, 1); assertTrue(result[0] instanceof Map<?, ?>); Map<String, ?> domainMap = (Map<String, ?>) result[0]; Map<?, ?> domainMap = (Map<?, ?>) result[0]; assertNotNull(domainMap); Object[] optsList = (Object[])domainMap.get("domainoptions"); if (optsList == null) {