diff --git a/app/assets/javascripts/admin/order_cycle.js.erb b/app/assets/javascripts/admin/order_cycle.js.erb index 101ead3427..960bf8ec37 100644 --- a/app/assets/javascripts/admin/order_cycle.js.erb +++ b/app/assets/javascripts/admin/order_cycle.js.erb @@ -59,10 +59,14 @@ angular.module('order_cycle', ['ngResource']). for(i in service.order_cycle.exchanges) { var exchange = service.order_cycle.exchanges[i]; if(exchange.sender_id == service.order_cycle.coordinator_id) { - service.order_cycle.outgoing_exchanges.push({enterprise_id: exchange.receiver_id, active: true}); + $.extend(exchange, {enterprise_id: exchange.receiver_id, active: true}); + delete(exchange.sender_id); + service.order_cycle.outgoing_exchanges.push(exchange); } else if(exchange.receiver_id == service.order_cycle.coordinator_id) { - service.order_cycle.incoming_exchanges.push({enterprise_id: exchange.sender_id, active: true}); + $.extend(exchange, {enterprise_id: exchange.sender_id, active: true}); + delete(exchange.receiver_id); + service.order_cycle.incoming_exchanges.push(exchange) } else { console.log('Exchange between two enterprises, neither of which is coordinator!'); diff --git a/app/views/admin/order_cycles/show.rep b/app/views/admin/order_cycles/show.rep index 7fbb08157b..cabdf9cfcf 100644 --- a/app/views/admin/order_cycles/show.rep +++ b/app/views/admin/order_cycles/show.rep @@ -7,5 +7,10 @@ r.element :order_cycle, @order_cycle do r.list_of :exchanges do r.element :sender_id r.element :receiver_id + r.list_of :exchange_variants do + r.element :variant do + r.element :id + end + end end end