From 7475d4249ae105bdb5eaaa9311ad412c3ea3fd02 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Wed, 15 May 2013 11:31:00 +0200 Subject: [PATCH] bug #2034: Improve cookie expiration time handling (cherry picked from commit 281145507e5e46102ab98656ed1c012853787537) --- src/sunstone/public/js/plugins/clusters-tab.js | 3 --- src/sunstone/public/js/plugins/config-tab.js | 8 ++++---- src/sunstone/sunstone-server.rb | 12 ++---------- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/src/sunstone/public/js/plugins/clusters-tab.js b/src/sunstone/public/js/plugins/clusters-tab.js index 8ebc232520..97fc34c4ea 100644 --- a/src/sunstone/public/js/plugins/clusters-tab.js +++ b/src/sunstone/public/js/plugins/clusters-tab.js @@ -1389,9 +1389,6 @@ function clusterResourceViewListeners(){ //Prepares the autorefresh for hosts function setClusterAutorefresh() { setInterval(function(){ - var selected_menu = $('div#menu li.navigation-active-li'); - var inSubMenu = selected_menu.attr('id').indexOf('cluster') > 0; - var checked = $('input.check_item:checked',dataTable_clusters); var filter = $("#cluster_search").attr('value'); if ((checked.length==0) && !filter){ diff --git a/src/sunstone/public/js/plugins/config-tab.js b/src/sunstone/public/js/plugins/config-tab.js index 558d76ca96..d515ba1fc9 100644 --- a/src/sunstone/public/js/plugins/config-tab.js +++ b/src/sunstone/public/js/plugins/config-tab.js @@ -192,7 +192,7 @@ Sunstone.addActions({ notifyMessage(tr("Template updated correctly")); OpenNebula.User.show({ data : { - id: uid + id: "-1" }, success: updateUserConfigInfo }); @@ -265,7 +265,7 @@ function setupConfigDialog() { OpenNebula.User.show({ data : { - id: uid + id: "-1" }, success: function(request,user_json){ var template = user_json.USER.TEMPLATE; @@ -355,14 +355,14 @@ $(document).ready(function(){ $("span.user-login a.configuration").click(function(){ OpenNebula.User.show({ data : { - id: uid + id: '-1' }, success: updateUserConfigInfo }); OpenNebula.Group.show({ data : { - id: gid + id: '-1' }, success: function(request,group_json){ var info = group_json.GROUP; diff --git a/src/sunstone/sunstone-server.rb b/src/sunstone/sunstone-server.rb index 7374a935e3..29304c5894 100755 --- a/src/sunstone/sunstone-server.rb +++ b/src/sunstone/sunstone-server.rb @@ -250,16 +250,8 @@ get '/' do if !authorized? return erb :login end - time = Time.now + 60*10 - response.set_cookie("one-user", - :value=>"#{session[:user]}", - :expires=>time) - response.set_cookie("one-user_id", - :value=>"#{session[:user_id]}", - :expires=>time) - response.set_cookie("one-user_gid", - :value=>"#{session[:user_gid]}", - :expires=>time) + + response.set_cookie("one-user", :value=>"#{session[:user]}") erb :index end