| .. | .. |
|---|
| 434 | 434 | var refFields = [{resource: 'organization', name: 'organization_id'},{resource: 'licensetype', name: 'license_type_id'}]; |
|---|
| 435 | 435 | Catalogs.loadRefs(function(refs) { |
|---|
| 436 | 436 | $scope.refs = refs; |
|---|
| 437 | | - angular.forEach($scope.packs, function(elem) { |
|---|
| 438 | | - elem.organization_code = $scope.getOrganizationCode(elem.organization_id); |
|---|
| 439 | | - elem.license_type_code = $scope.getLicenseTypeCode(elem.license_type_id); |
|---|
| 440 | | - }); |
|---|
| 437 | + $scope._extendPackListing($scope.packs); |
|---|
| 441 | 438 | }, refFields); |
|---|
| 442 | 439 | }); |
|---|
| 443 | 440 | |
|---|
| .. | .. |
|---|
| 452 | 449 | $scope.pack = null; |
|---|
| 453 | 450 | |
|---|
| 454 | 451 | $scope.packs = Packs.getPacksList(function(list) { |
|---|
| 455 | | - console.log('The packs were got: ' + list); |
|---|
| 456 | | - angular.forEach(list, function(elem) { |
|---|
| 452 | + $scope._extendPackListing(list); |
|---|
| 453 | + }); |
|---|
| 454 | + |
|---|
| 455 | + /** |
|---|
| 456 | + * Added calculated fields like org_code and lic_type_code to pack listing |
|---|
| 457 | + */ |
|---|
| 458 | + $scope._extendPackListing = function(listing) { |
|---|
| 459 | + angular.forEach(listing, function(elem) { |
|---|
| 457 | 460 | elem.organization_code = $scope.getOrganizationCode(elem.organization_id); |
|---|
| 458 | 461 | elem.license_type_code = $scope.getLicenseTypeCode(elem.license_type_id); |
|---|
| 459 | 462 | }); |
|---|
| 460 | | - }); |
|---|
| 461 | | - |
|---|
| 463 | + } |
|---|
| 464 | + |
|---|
| 462 | 465 | $scope.save = function() { |
|---|
| 463 | 466 | Packs.savePackData($scope.pack, $scope.isNew, function() { |
|---|
| 464 | 467 | if (!$scope.isNew) { |
|---|
| .. | .. |
|---|
| 466 | 469 | } else { |
|---|
| 467 | 470 | $scope.newPack(); |
|---|
| 468 | 471 | } |
|---|
| 469 | | - $scope.packs = Packs.getPacksList(); |
|---|
| 472 | + $scope.packs = Packs.getPacksList(function(list) { |
|---|
| 473 | + $scope._extendPackListing(list); |
|---|
| 474 | + }); |
|---|
| 470 | 475 | }); |
|---|
| 471 | 476 | } |
|---|
| 472 | 477 | |
|---|
| .. | .. |
|---|
| 479 | 484 | if (extra_data) { |
|---|
| 480 | 485 | Packs[action](pack || $scope.pack, extra_data, function() { |
|---|
| 481 | 486 | if (!$scope.isNew) $scope.showForm = false; |
|---|
| 482 | | - $scope.packs = Packs.getPacksList(); |
|---|
| 487 | + $scope.packs = Packs.getPacksList(function(list) { |
|---|
| 488 | + $scope._extendPackListing(list); |
|---|
| 489 | + }); |
|---|
| 483 | 490 | }); |
|---|
| 484 | 491 | } else { |
|---|
| 485 | 492 | Packs[action](pack || $scope.pack, function() { |
|---|
| 486 | 493 | if (!$scope.isNew) $scope.showForm = false; |
|---|
| 487 | | - $scope.packs = Packs.getPacksList(); |
|---|
| 494 | + $scope.packs = Packs.getPacksList(function(list) { |
|---|
| 495 | + $scope._extendPackListing(list); |
|---|
| 496 | + }); |
|---|
| 488 | 497 | }); |
|---|
| 489 | 498 | } |
|---|
| 490 | 499 | } |
|---|
