Applied the patch provided by Stefan Seifert for FELIX-4711
Web Console: False AJAX error displayed on deleting or unbinding config
https://issues.apache.org/jira/browse/FELIX-4711
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1641786 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigManager.java b/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigManager.java
index c818b87..0cc826e 100644
--- a/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigManager.java
+++ b/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigManager.java
@@ -164,8 +164,9 @@
}
else
{
- response.setContentType("text/plain"); //$NON-NLS-1$
- response.getWriter().print("true"); //$NON-NLS-1$
+ response.setContentType( "application/json" ); //$NON-NLS-1$
+ response.setCharacterEncoding( "UTF-8" ); //$NON-NLS-1$
+ response.getWriter().print( "{ \"status\": true }" ); //$NON-NLS-1$
}
return;
diff --git a/webconsole/src/main/resources/res/ui/config.js b/webconsole/src/main/resources/res/ui/config.js
index 54d0868..af2f43b 100644
--- a/webconsole/src/main/resources/res/ui/config.js
+++ b/webconsole/src/main/resources/res/ui/config.js
@@ -439,7 +439,7 @@
function deleteConfig(/* String */ configId, /* String */ bundleLocation)
{
if ( configConfirm(i18n.del_ask, configId, bundleLocation) ) {
- $.post(pluginRoot + '/' + configId, param.apply + '=1&' + param.dele + '=1', null, function() {
+ $.post(pluginRoot + '/' + configId, param.apply + '=1&' + param.dele + '=1', function() {
document.location.href = pluginRoot;
}, 'json');
return true;
@@ -450,7 +450,7 @@
function unbindConfig(/* String */ configId, /* String */ bundleLocation)
{
if ( configConfirm(i18n.unbind_ask, configId, bundleLocation) ) {
- $.post(pluginRoot + '/' + configId, param.unbind + '=1', null, function() {
+ $.post(pluginRoot + '/' + configId, param.unbind + '=1', function() {
document.location.href = pluginRoot + '/' + configId;
}, 'json');
return true;