Download as
Browse Code »

Commit b140da91a877de5907223305cfa774eb9dac4b58

Authored by Victor Costa
1 parent 9624e79c
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

rails3: fix json ecape

Showing 2 changed files with 12 additions and 3 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @b140da9
... ... @@ -1070,7 +1070,7 @@ module ApplicationHelper
1070 1070 end
1071 1071  
1072 1072 link_to(content_tag(:span, _('Contents'), :class => 'icon-menu-articles'), {:controller => "search", :action => 'contents', :category_path => ''}, :id => 'submenu-contents') +
1073   - link_to(content_tag(:span, _('Contents menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-contents-trigger')
  1073 + link_to(content_tag(:span, _('Contents menu')), '#', :onclick => "toggleSubmenu(this,'',#{j links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-contents-trigger')
1074 1074 end
1075 1075 alias :browse_contents_menu :search_contents_menu
1076 1076  
... ... @@ -1086,7 +1086,7 @@ module ApplicationHelper
1086 1086 end
1087 1087  
1088 1088 link_to(content_tag(:span, _('People'), :class => 'icon-menu-people'), {:controller => "search", :action => 'people', :category_path => ''}, :id => 'submenu-people') +
1089   - link_to(content_tag(:span, _('People menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-people-trigger')
  1089 + link_to(content_tag(:span, _('People menu')), '#', :onclick => "toggleSubmenu(this,'',#{j links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-people-trigger')
1090 1090 end
1091 1091 alias :browse_people_menu :search_people_menu
1092 1092  
... ... @@ -1102,7 +1102,7 @@ module ApplicationHelper
1102 1102 end
1103 1103  
1104 1104 link_to(content_tag(:span, _('Communities'), :class => 'icon-menu-community'), {:controller => "search", :action => 'communities'}, :id => 'submenu-communities') +
1105   - link_to(content_tag(:span, _('Communities menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-communities-trigger')
  1105 + link_to(content_tag(:span, _('Communities menu')), '#', :onclick => "toggleSubmenu(this,'',#{j links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-communities-trigger')
1106 1106 end
1107 1107 alias :browse_communities_menu :search_communities_menu
1108 1108  
... ...
config/initializers/json_escape.rb 0 → 100644
  Diff comments   View file @b140da9
... ... @@ -0,0 +1,9 @@
  1 +class ActionView::Base
  2 + def json_escape(s)
  3 + #result = s.to_s.gsub('/', '\/')
  4 + result = CGI::escapeHTML(s)
  5 + s.html_safe? ? result.html_safe : result
  6 + end
  7 +
  8 + alias j json_escape
  9 +end
... ...