Download as
Browse Code »

Commit 43a702b4d7caec7a65cbc889f296768b8f1e13a0

Authored by Larissa Reis
2 parents 82ab76ba 379057c0
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

Merge branch 'fix_edit_page' into 'next' 

Remove unused javascript tag that was breaking profile edition page.

Fixing profile edit page

See merge request !552
Showing 1 changed file with 0 additions and 1 deletions   Show diff stats
app/views/profile_editor/edit.html.erb
  Diff comments   View file @43a702b
1 <h1><%= _('Profile settings for %s') % profile.name %></h1> 1 <h1><%= _('Profile settings for %s') % profile.name %></h1>
2 2
3 -<%= javascript_include_tag 'deactivate_profile' %>  
4 <%= error_messages_for :profile_data %> 3 <%= error_messages_for :profile_data %>
5 4
6 <%= labelled_form_for :profile_data, :html => { :id => 'profile-data', :multipart => true } do |f| %> 5 <%= labelled_form_for :profile_data, :html => { :id => 'profile-data', :multipart => true } do |f| %>