From 3ba6169997171d3f6cae5dd09d3fdbd4b4233e54 Mon Sep 17 00:00:00 2001 From: Daniela Soares Feitosa Date: Tue, 17 Jul 2012 10:37:36 -0300 Subject: [PATCH] Avoiding repetition of code --- app/helpers/manage_products_helper.rb | 4 ++++ app/views/manage_products/_certifiers_for_selection.rhtml | 3 +-- app/views/manage_products/_edit_info.rhtml | 5 ++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/helpers/manage_products_helper.rb b/app/helpers/manage_products_helper.rb index 0e8d8cc..a6f3957 100644 --- a/app/helpers/manage_products_helper.rb +++ b/app/helpers/manage_products_helper.rb @@ -241,6 +241,10 @@ module ManageProductsHelper end end + def remove_qualifier_button + button_to_function(:delete, content_tag('span', _('Delete qualifier')), "jQuery(this).parents('tr').remove()") + end + def select_unit(object) collection_select(object.class.name.downcase, :unit_id, environment.units, :id, :singular, {:include_blank => _('Select the unit')}) end diff --git a/app/views/manage_products/_certifiers_for_selection.rhtml b/app/views/manage_products/_certifiers_for_selection.rhtml index e41279f..07ae53a 100644 --- a/app/views/manage_products/_certifiers_for_selection.rhtml +++ b/app/views/manage_products/_certifiers_for_selection.rhtml @@ -1,5 +1,4 @@ -<%= select_certifiers(@qualifier) + - button_to_function(:delete, content_tag('span', 'Delete qualifier'), "jQuery(this).parents('tr').remove()") %> +<%= select_certifiers(@qualifier) + remove_qualifier_button %> <% javascript_tag do %> jQuery('#product-qualifiers-list *').removeClass('small-loading') <% end %> diff --git a/app/views/manage_products/_edit_info.rhtml b/app/views/manage_products/_edit_info.rhtml index da85131..66caa94 100644 --- a/app/views/manage_products/_edit_info.rhtml +++ b/app/views/manage_products/_edit_info.rhtml @@ -39,8 +39,7 @@ <%= select_qualifiers(@product, qualifier.id) %> - <%= select_certifiers(qualifier, @product) + - button_to_function(:delete, content_tag('span', 'Delete qualifier'), "jQuery(this).parents('tr').remove()") %> + <%= select_certifiers(qualifier, @product) + remove_qualifier_button %> <% end %> @@ -48,7 +47,7 @@ <%= button_to_function( :add, _('Add new qualifier'), - "new_qualifier_row('#product-qualifiers-list', '#{escape_javascript(select_qualifiers(@product))}', '#{escape_javascript(button_to_function(:delete, content_tag('span', 'Delete qualifier'), 'jQuery(this).parents(\'tr\').remove()'))}')" + "new_qualifier_row('#product-qualifiers-list', '#{escape_javascript(select_qualifiers(@product))}', '#{escape_javascript(remove_qualifier_button)}')" ) %> <%= hidden_field_tag "product[qualifiers_list][nil]" %> <% end %> -- libgit2 0.21.2