Merge pull request #6176 from IQSS/6173-fix-settings-api

6173 fix settings api
IQSS · Sep 17, 2019 · 210499a · 210499a
2 parents cf4b864 + 83de8c0
commit 210499a
Showing 1 changed file with 33 additions and 2 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/settings/SettingsServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/settings/SettingsServiceBean.java
@@ -518,15 +518,46 @@ public String getValueForKey( Key key, String lang, String defaultValue ) {
     }
 
     public Setting set( String name, String content ) {
-        Setting s = new Setting( name, content );
+        Setting s = null; 
+
+        List<Setting> tokens = em.createNamedQuery("Setting.findByName", Setting.class)
+                .setParameter("name", name )
+                .getResultList();
+
+        if(tokens.size() > 0) {
+            s = tokens.get(0);
+        }
+
+        if (s == null) {
+            s = new Setting( name, content );
+        } else {
+            s.setContent(content);
+        }
+
         s = em.merge(s);
         actionLogSvc.log( new ActionLogRecord(ActionLogRecord.ActionType.Setting, "set")
                             .setInfo(name + ": " + content));
         return s;
     }
 
     public Setting set( String name, String lang, String content ) {
-        Setting s = new Setting( name, lang, content );
+        Setting s = null; 
+
+        List<Setting> tokens = em.createNamedQuery("Setting.findByNameAndLang", Setting.class)
+                .setParameter("name", name )
+                .setParameter("lang", lang )
+                .getResultList();
+
+        if(tokens.size() > 0) {
+            s = tokens.get(0);
+        }
+
+        if (s == null) {
+            s = new Setting( name, lang, content );
+        } else {
+            s.setContent(content);
+        }
+
         em.merge(s);
         actionLogSvc.log( new ActionLogRecord(ActionLogRecord.ActionType.Setting, "set")
                 .setInfo(name + ": " +lang + ": " + content));