Ember temp commit

2013-09-24 08:47:30 +02:00
parent ebbb5dedfc
commit 5650ada04c
71 changed files with 595 additions and 66 deletions
@@ -13,6 +13,8 @@ module Suppliers
      end
      if params[:show_all] == 'yes'
        @lists = List.for_supplier(current_supplier, page: params[:page], per_page: params[:per_page] || 25)
+      elsif params[:state] == 'active'
+        @lists = List.active_for_supplier(current_supplier.id)
      else
        @lists  = List.for_supplier_created_at current_supplier, @start_time..@end_time
      end
@@ -31,7 +33,7 @@ module Suppliers
      respond_to do |format|
        format.html {}
        format.json do
-          render json: @list.with_orders_as_json
+          render json: {list: @list.with_orders_as_json}
        end
      end
    end