Download as
Browse Code »

Commit 445b9833e90a8d9c92cfcd9b2e8f17d881c46e05

Authored by Antonio Terceiro
2 parents 2917f48f b4a1f3b9
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

Merge branch 'fix_javascript_bug' into 'master' 

Fix javascript bug

The refactoring of this commit 64d0ae2868654ad922dea3ae23ad3ad7a0421903 was causing the user to be logged out after trying to change his homepage.

See merge request !414
Showing 1 changed file with 3 additions and 5 deletions   Show diff stats
public/javascripts/application.js
  Diff comments   View file @445b983
... ... @@ -523,8 +523,10 @@ function userDataCallback(data) {
523 523 if (data.login) {
524 524 // logged in
525 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 531 if (data.notice) {
530 532 display_notice(data.notice);
... ... @@ -546,10 +548,6 @@ jQuery(function($) {
546 548  
547 549 var user_data = noosfero_root() + '/account/user_data';
548 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 552 $.ajaxSetup({ cache: false });
555 553  
... ...