Download as
Browse Code »

Commit fa48ff328309f877bc41ddb430126678c7d09362

Authored by AntonioTerceiro
1 parent e6c532aa
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

ActionItem170: minor fix in submit button and one of the calls to it which was 

breaking several tests


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1435 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @fa48ff3
@@ -278,7 +278,7 @@ module ApplicationHelper @@ -278,7 +278,7 @@ module ApplicationHelper
278 end 278 end
279 279
280 def submit_button(type, label, html_options = {}) 280 def submit_button(type, label, html_options = {})
281 - bt_cancel = html_options[:cancel] ? "<input type='button' class='button bt_cancel' value='" + _('Cancel') + "' onclick='document.location.href = \"#{url_for html_options.delete(:cancel)}\"'> " : '' 281 + bt_cancel = html_options[:cancel] ? button(:cancel, _('Cancel'), html_options[:cancel]) : ''
282 282
283 html_options[:class] = [html_options[:class], 'submit'].compact.join(' ') 283 html_options[:class] = [html_options[:class], 'submit'].compact.join(' ')
284 284
@@ -289,7 +289,7 @@ module ApplicationHelper @@ -289,7 +289,7 @@ module ApplicationHelper
289 289
290 bt_submit = submit_tag(label, html_options.merge(:class => the_class)) 290 bt_submit = submit_tag(label, html_options.merge(:class => the_class))
291 291
292 - bt_submit + bt_cancel 292 + bt_submit
293 end 293 end
294 294
295 def button_to_function(type, label, js_code, html_options = {}) 295 def button_to_function(type, label, js_code, html_options = {})
app/views/cms/edit.rhtml
  Diff comments   View file @fa48ff3
@@ -16,6 +16,6 @@ @@ -16,6 +16,6 @@
16 %> 16 %>
17 17
18 <% button_bar do %> 18 <% button_bar do %>
19 - <%= submit_button('save', _('Save'), :cancel => [:action => (@article.parent ? 'view' : 'index')], :id => @article.parent) %> 19 + <%= submit_button('save', _('Save'), :cancel => (@article.parent ? { :action => 'view', :id => @article.parent.id } : { :action => 'index' } )) %>
20 <% end %> 20 <% end %>
21 <% end %> 21 <% end %>