Fixed FELIX-3311 Cookie handling seems not to work anymore
https://issues.apache.org/jira/browse/FELIX-3311
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1236136 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java b/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
index 2fb276b..c465e8e 100644
--- a/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
+++ b/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
@@ -111,7 +111,7 @@
* The name of the cookie storing user-configured locale
* See https://issues.apache.org/jira/browse/FELIX-2267
*/
- private static final String COOKIE_LOCALE = "felix.webconsole.locale"; //$NON-NLS-1$
+ private static final String COOKIE_LOCALE = "felix-webconsole-locale"; //$NON-NLS-1$
private final String FRAMEWORK_PROP_MANAGER_ROOT = "felix.webconsole.manager.root"; //$NON-NLS-1$
diff --git a/webconsole/src/main/resources/res/lib/support.js b/webconsole/src/main/resources/res/lib/support.js
index 0698624..a5c118c 100644
--- a/webconsole/src/main/resources/res/lib/support.js
+++ b/webconsole/src/main/resources/res/lib/support.js
@@ -275,12 +275,13 @@
* @param value The value for the cookie
*/
function setCookie( /* String */name, /* String */value) {
- var date = new Date();
- date.setFullYear(date.getFullYear() + 20);
- $.cookies.set("felix-webconsole-" + name, value, {
- expiresAt : date,
- path : appRoot
- });
+ var date = new Date();
+ date.setFullYear(date.getFullYear() + 20);
+ $.cookies.del("felix-webconsole-" + name);
+ $.cookies.set("felix-webconsole-" + name, value, {
+ expiresAt : date,
+ path : appRoot
+ });
}
/**
@@ -289,7 +290,7 @@
* @param name The name of the cookie
*/
/* String */ function getCookie(/*String */name) {
- $.cookies.get("felix-webconsole-" + name);
+ return $.cookies.get("felix-webconsole-" + name);
}
// language selection element
@@ -299,7 +300,7 @@
function() { $(this).find('.flags').show('blind') },
function() { $(this).find('.flags').hide('blind') });
langSelect.find('.flags img').click(function() {
- setCookie("locale", $(this).attr('alt'));
+ setCookie("locale", $(this).attr('alt'));
location.reload();
});
var locale = getCookie("locale");