Mercurial > lada > lada-server
comparison src/main/java/de/intevation/lada/util/auth/ProbeAuthorizer.java @ 840:2fe625c91ab3
Merged branches.
| author | Raimund Renkert <raimund.renkert@intevation.de> |
|---|---|
| date | Thu, 21 Jan 2016 09:01:57 +0100 |
| parents | fa922101a462 |
| children | d0a591b3eade |
comparison
equal
deleted
inserted
replaced
| 837:9dd9a3de7a61 | 840:2fe625c91ab3 |
|---|---|
| 15 RequestMethod method, | 15 RequestMethod method, |
| 16 UserInfo userInfo, | 16 UserInfo userInfo, |
| 17 Class<T> clazz | 17 Class<T> clazz |
| 18 ) { | 18 ) { |
| 19 LProbe probe = (LProbe)data; | 19 LProbe probe = (LProbe)data; |
| 20 if (method == RequestMethod.POST) { | 20 if (method == RequestMethod.PUT || |
| 21 return getAuthorization(userInfo, probe); | 21 method == RequestMethod.DELETE) { |
| 22 } | |
| 23 else if (method == RequestMethod.PUT || | |
| 24 method == RequestMethod.DELETE) { | |
| 25 return !isProbeReadOnly(probe.getId()); | 22 return !isProbeReadOnly(probe.getId()); |
| 26 } | 23 } |
| 27 return false; | 24 return getAuthorization(userInfo, probe); |
| 28 } | 25 } |
| 29 | 26 |
| 30 @SuppressWarnings("unchecked") | 27 @SuppressWarnings("unchecked") |
| 31 @Override | 28 @Override |
| 32 public <T> Response filter( | 29 public <T> Response filter( |