diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-10-30 14:40:28 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-10-30 14:40:28 +0100 |
| commit | def91ef4b2e19c18aa1f17de391fe08f165292a8 (patch) | |
| tree | 5e84c647062dca710a415e7c465e12736c445d40 /id/ConfigWebTool/src/main/java/at/gv/egovernment | |
| parent | 9db09d20a485496a558aa880f1d76684181e4085 (diff) | |
| download | moa-id-spss-def91ef4b2e19c18aa1f17de391fe08f165292a8.tar.gz moa-id-spss-def91ef4b2e19c18aa1f17de391fe08f165292a8.tar.bz2 moa-id-spss-def91ef4b2e19c18aa1f17de391fe08f165292a8.zip | |
fix problems with non-admin user
Diffstat (limited to 'id/ConfigWebTool/src/main/java/at/gv/egovernment')
2 files changed, 10 insertions, 4 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java index 9c1cb90e0..415e1c957 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java @@ -401,9 +401,7 @@ public class BasicOAAction extends BasicAction { form.store(dboa, authUser, request); try { - if (dboa.isIsNew()) { - ConfigurationDBUtils.save(dboa); - + if (dboa.isIsNew()) { if (!authUser.isAdmin()) { UserDatabase user = ConfigurationDBRead.getUserWithID(authUser.getUserID()); @@ -412,7 +410,12 @@ public class BasicOAAction extends BasicAction { useroas.add(dboa); ConfigurationDBUtils.saveOrUpdate(user); + + } else { + ConfigurationDBUtils.save(dboa); + } + } else ConfigurationDBUtils.saveOrUpdate(dboa); diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java index 1893b0f60..4cd556b75 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java @@ -346,8 +346,11 @@ public class EditOAAction extends BasicOAAction { ConfigurationDBUtils.saveOrUpdate(moaconfig); } + } catch (NullPointerException e) { + log.debug("Found no MetadataURL in OA-Databaseconfig"); + } catch (Throwable e) { - log.info("Found no MetadataURL in OA-Databaseconfig!", e); + log.info("Set metadata refresh flag FAILED.", e); } if (ConfigurationDBUtils.delete(onlineapplication)) { |