Don't show deleted ordergroups (closes #362)

foodcoops · Apr 17, 2015 · c08c29b · c08c29b
1 parent a016f0d
commit c08c29b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/views/finance/financial_transactions/_ordergroup.haml b/app/views/finance/financial_transactions/_ordergroup.haml
@@ -1,7 +1,7 @@
 %tr.transaction
  %td
  = select_tag 'financial_transactions[][ordergroup_id]',
- options_for_select(Ordergroup.order(:name).map { |g| [ g.name, g.id ] })
+ options_for_select(Ordergroup.undeleted.order(:name).map { |g| [ g.name, g.id ] })
  %td= text_field_tag 'financial_transactions[][amount]', nil, class: 'input-small'
  %td= link_to t('.remove'), "#", :title => t('.remove_group'), 'data-remove-transaction' => true,
  class: 'btn btn-small'
diff --git a/app/views/group_order_articles/_form.html.haml b/app/views/group_order_articles/_form.html.haml
@@ -4,7 +4,7 @@
  = close_button :modal
  %h3= t('.amount_change_for', article: @order_article.article.name)
  .modal-body
- = form.input :ordergroup_id, as: :select, collection: Ordergroup.all.map { |g| [g.name, g.id] }
+ = form.input :ordergroup_id, as: :select, collection: Ordergroup.undeleted.map { |g| [g.name, g.id] }
  = form.input :result, hint: I18n.t('group_order_articles.form.result_hint', unit: @order_article.article.unit) # Why do we need the full prefix?
  .modal-footer
  = link_to t('ui.close'), '#', class: 'btn', data: {dismiss: 'modal'}