raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-27 01:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use angular's extend instead of jquery's

Browse Source
This commit is contained in:
Rohan Mitchell
2013-01-11 10:54:53 +11:00
parent 24a48a9b33
commit 3694321f66
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/admin/order_cycle.js.erb
View File

@@ -96,18 +96,18 @@ angular.module('order_cycle', ['ngResource']).
var service = this;
OrderCycle.get({order_cycle_id: order_cycle_id}, function(oc) {
$.extend(service.order_cycle, oc);
angular.extend(service.order_cycle, oc);
service.order_cycle.incoming_exchanges = [];
service.order_cycle.outgoing_exchanges = [];
for(i in service.order_cycle.exchanges) {
var exchange = service.order_cycle.exchanges[i];
if(exchange.sender_id == service.order_cycle.coordinator_id) {
$.extend(exchange, {enterprise_id: exchange.receiver_id, active: true});
angular.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) {
$.extend(exchange, {enterprise_id: exchange.sender_id, active: true});
angular.extend(exchange, {enterprise_id: exchange.sender_id, active: true});
delete(exchange.receiver_id);
service.order_cycle.incoming_exchanges.push(exchange)