Commit 4718145b41823710e79310e84713df67e3dec194
Exists in
master
and in
22 other branches
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
| @@ -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
| @@ -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' %> |