allow to edit GroupOrderArticle result from orders screen

Conflicts: app/assets/javascripts/application.js
2014-01-23 16:17:16 +01:00 · 2014-01-23 16:17:16 +01:00 · 60826ceedc
commit 60826ceedc
parent f9d2c20aaa
34 changed files with 393 additions and 220 deletions
--- a/app/views/orders/show.html.haml
+++ b/app/views/orders/show.html.haml
@ -98,3 +98,5 @@
    $(function() {
      activate_search('#{j @view}', '#{j t(".search_placeholder.#{@view}")}');
    });
+
+= render 'shared/articles_by/common', order: @order