From 97a20ed01cb5ec890517e4fcbd67b8d8ff381787 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 24 Oct 2011 21:51:46 -0400 Subject: [PATCH] Working edit settings RPC. Web.xml is not directly modified. --- src/com/gitblit/GitBlit.java | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java index ffef94a..8386d2d 100644 --- a/src/com/gitblit/GitBlit.java +++ b/src/com/gitblit/GitBlit.java @@ -25,7 +25,6 @@ import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -253,9 +252,8 @@ * @param settings * @return true if the update succeeded */ - public boolean updateSettings(Collection<SettingModel> settings) { - // TODO update the settings - return false; + public boolean updateSettings(Map<String, String> updatedSettings) { + return settings.saveSettings(updatedSettings); } public ServerStatus getStatus() { @@ -1326,7 +1324,7 @@ // Read bundled Gitblit properties to extract setting descriptions. // This copy is pristine and only used for populating the setting // models map. - InputStream is = servletContext.getResourceAsStream("/WEB-INF/gitblit.properties"); + InputStream is = servletContext.getResourceAsStream("/WEB-INF/reference.properties"); BufferedReader propertiesReader = new BufferedReader(new InputStreamReader(is)); StringBuilder description = new StringBuilder(); SettingModel setting = new SettingModel(); -- Gitblit v1.9.1