Download as
Browse Code »

Commit 4718145b41823710e79310e84713df67e3dec194

Authored by Daniela Feitosa
2 parents 561068ae 2a1c3797
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 commit 'refs/merge-requests/182' of git://gitorious.org/noosfero/noosfero … 

…into merge-requests/182
Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
app/models/product.rb
  Diff comments   View file @4718145
@@ -155,7 +155,7 @@ class Product < ActiveRecord::Base @@ -155,7 +155,7 @@ class Product < ActiveRecord::Base
155 def qualifiers_list=(qualifiers) 155 def qualifiers_list=(qualifiers)
156 self.product_qualifiers.destroy_all 156 self.product_qualifiers.destroy_all
157 qualifiers.each do |qualifier_id, certifier_id| 157 qualifiers.each do |qualifier_id, certifier_id|
158 - self.product_qualifiers.create(:qualifier_id => qualifier_id, :certifier_id => certifier_id) 158 + self.product_qualifiers.create(:qualifier_id => qualifier_id, :certifier_id => certifier_id) if qualifier_id != 'nil'
159 end 159 end
160 end 160 end
161 161
app/views/manage_products/_edit_info.rhtml
  Diff comments   View file @4718145
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
50 _('Add new qualifier'), 50 _('Add new qualifier'),
51 "new_qualifier_row('#product-qualifiers-list', '#{escape_javascript(select_qualifiers(@product))}')" 51 "new_qualifier_row('#product-qualifiers-list', '#{escape_javascript(select_qualifiers(@product))}')"
52 ) %> 52 ) %>
53 - <%= hidden_field_tag "product[qualifiers_list]" %> 53 + <%= hidden_field_tag "product[qualifiers_list][nil]" %>
54 <% end %> 54 <% end %>
55 55
56 <%= hidden_field_tag 'info-bar-update-url', @product.price_composition_bar_display_url, :class => 'bar-update-url' %> 56 <%= hidden_field_tag 'info-bar-update-url', @product.price_composition_bar_display_url, :class => 'bar-update-url' %>