Download as
Browse Code »

Commit b67c05a56c1905dd3350fabddaac1f014e2b7e6f

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

ActionItem250: fixing button helper method: don't throw away upstream 

class


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1589 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 10 additions and 1 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @b67c05a
... ... @@ -248,7 +248,11 @@ module ApplicationHelper
248 248 end
249 249  
250 250 def button(type, label, url, html_options = {})
251   - button_without_text type, label, url, html_options.merge(:class=>'with-text')
  251 + the_class = 'with-text'
  252 + if html_options.has_key?(:class)
  253 + the_class << ' ' << html_options[:class]
  254 + end
  255 + button_without_text type, label, url, html_options.merge(:class => the_class)
252 256 end
253 257  
254 258 def button_without_text(type, label, url, html_options = {})
... ...
test/unit/application_helper_test.rb
  Diff comments   View file @b67c05a
... ... @@ -50,6 +50,11 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
50 50 assert_equal '', show_time(nil)
51 51 end
52 52  
  53 + should 'append with-text class and keep existing classes' do
  54 + expects(:button_without_text).with('type', 'label', 'url', { :class => 'with-text class1'})
  55 + button('type', 'label', 'url', { :class => 'class1' })
  56 + end
  57 +
53 58 protected
54 59  
55 60 def content_tag(tag, content, options)
... ...