Download as
Browse Code »

Commit b4a1f3b9ff69433ffe395678dfa8d97fa771e5a7

Authored by Luciano Prestes
Committed by Gabriela Navarro
1 parent 176093a3
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Fix homepage button to keep user looged in at application.js 

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Showing 1 changed file with 3 additions and 5 deletions   Show diff stats
public/javascripts/application.js
  Diff comments   View file @b4a1f3b
@@ -523,8 +523,10 @@ function userDataCallback(data) { @@ -523,8 +523,10 @@ function userDataCallback(data) {
523 if (data.login) { 523 if (data.login) {
524 // logged in 524 // logged in
525 if (data.chat_enabled) { 525 if (data.chat_enabled) {
526 - setInterval(function(){ $.getJSON(user_data, chatOnlineUsersDataCallBack)}, 10000); 526 + setInterval(function(){ jQuery.getJSON(user_data, chatOnlineUsersDataCallBack)}, 10000);
527 } 527 }
  528 + jQuery('head').append('<meta content="authenticity_token" name="csrf-param" />');
  529 + jQuery('head').append('<meta content="'+jQuery.cookie("_noosfero_.XSRF-TOKEN")+'" name="csrf-token" />');
528 } 530 }
529 if (data.notice) { 531 if (data.notice) {
530 display_notice(data.notice); 532 display_notice(data.notice);
@@ -546,10 +548,6 @@ jQuery(function($) { @@ -546,10 +548,6 @@ jQuery(function($) {
546 548
547 var user_data = noosfero_root() + '/account/user_data'; 549 var user_data = noosfero_root() + '/account/user_data';
548 $.getJSON(user_data, userDataCallback) 550 $.getJSON(user_data, userDataCallback)
549 - if (user_data.login) {  
550 - $('head').append('<meta content="authenticity_token" name="csrf-param" />');  
551 - $('head').append('<meta content="'+$.cookie("_noosfero_.XSRF-TOKEN")+'" name="csrf-token" />');  
552 - }  
553 551
554 $.ajaxSetup({ cache: false }); 552 $.ajaxSetup({ cache: false });
555 553