svn commit: r1236136 - in /felix/trunk/webconsole/src/main: java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java resources/res/lib/support.js

[vvalchev]

Author: vvalchev
Date: Thu Jan 26 11:03:41 2012
New Revision: 1236136

URL: http://svn.apache.org/viewvc?rev=1236136&view=rev
Log:
Fixed FELIX-3311 Cookie handling seems not to work anymore
https://issues.apache.org/jira/browse/FELIX-3311

Modified:
    
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
    felix/trunk/webconsole/src/main/resources/res/lib/support.js

Modified: 
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java?rev=1236136&r1=1236135&r2=1236136&view=diff
==============================================================================
--- 
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
 (original)
+++ 
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
 Thu Jan 26 11:03:41 2012
@@ -111,7 +111,7 @@ public class OsgiManager extends Generic
      * 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$
 

Modified: felix/trunk/webconsole/src/main/resources/res/lib/support.js
URL: 
http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/resources/res/lib/support.js?rev=1236136&r1=1236135&r2=1236136&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/resources/res/lib/support.js (original)
+++ felix/trunk/webconsole/src/main/resources/res/lib/support.js Thu Jan 26 
11:03:41 2012
@@ -275,12 +275,13 @@ function Xdialog(text) {
  * @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 @@ function setCookie( /* String */name, /*
  * @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 @@ $(document).ready(function() {
                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");