Download as
Browse Code »

Commit fa48ff328309f877bc41ddb430126678c7d09362

Authored by AntonioTerceiro
1 parent e6c532aa
Exists in master and in 28 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, stable, temp_ratings, tests, tests_fixies

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 %>