From fb1bbf788b8c2ec2cc292c66c851c7f0b9b19357 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Fri, 12 Dec 2014 12:01:18 +0000
Subject: [PATCH] #2140 fix - Added securis client properties file and some issues on API services
---
securis/src/main/webapp/js/licenses.js | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/securis/src/main/webapp/js/licenses.js b/securis/src/main/webapp/js/licenses.js
index 62bcb36..facb915 100644
--- a/securis/src/main/webapp/js/licenses.js
+++ b/securis/src/main/webapp/js/licenses.js
@@ -434,10 +434,7 @@
var refFields = [{resource: 'organization', name: 'organization_id'},{resource: 'licensetype', name: 'license_type_id'}];
Catalogs.loadRefs(function(refs) {
$scope.refs = refs;
- angular.forEach($scope.packs, function(elem) {
- elem.organization_code = $scope.getOrganizationCode(elem.organization_id);
- elem.license_type_code = $scope.getLicenseTypeCode(elem.license_type_id);
- });
+ $scope._extendPackListing($scope.packs);
}, refFields);
});
@@ -452,13 +449,19 @@
$scope.pack = null;
$scope.packs = Packs.getPacksList(function(list) {
- console.log('The packs were got: ' + list);
- angular.forEach(list, function(elem) {
+ $scope._extendPackListing(list);
+ });
+
+ /**
+ * Added calculated fields like org_code and lic_type_code to pack listing
+ */
+ $scope._extendPackListing = function(listing) {
+ angular.forEach(listing, function(elem) {
elem.organization_code = $scope.getOrganizationCode(elem.organization_id);
elem.license_type_code = $scope.getLicenseTypeCode(elem.license_type_id);
});
- });
-
+ }
+
$scope.save = function() {
Packs.savePackData($scope.pack, $scope.isNew, function() {
if (!$scope.isNew) {
@@ -466,7 +469,9 @@
} else {
$scope.newPack();
}
- $scope.packs = Packs.getPacksList();
+ $scope.packs = Packs.getPacksList(function(list) {
+ $scope._extendPackListing(list);
+ });
});
}
@@ -479,12 +484,16 @@
if (extra_data) {
Packs[action](pack || $scope.pack, extra_data, function() {
if (!$scope.isNew) $scope.showForm = false;
- $scope.packs = Packs.getPacksList();
+ $scope.packs = Packs.getPacksList(function(list) {
+ $scope._extendPackListing(list);
+ });
});
} else {
Packs[action](pack || $scope.pack, function() {
if (!$scope.isNew) $scope.showForm = false;
- $scope.packs = Packs.getPacksList();
+ $scope.packs = Packs.getPacksList(function(list) {
+ $scope._extendPackListing(list);
+ });
});
}
}
--
Gitblit v1.3.2