Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

6173 fix settings api #6176

Merged
merged 2 commits into from
Sep 17, 2019
Merged

6173 fix settings api #6176

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4820d2c
fixes the issue with the settings api introduced by #6042. (#6173)
landreev Sep 17, 2019
83de8c0
Merge branch 'develop' into 6173-fix-settings-api
landreev Sep 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 33 additions & 2 deletions src/main/java/edu/harvard/iq/dataverse/settings/SettingsServiceBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down