From ab47678d768178de568d09b1a8c53470527af1a3 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Fri, 05 Dec 2014 12:12:32 +0000
Subject: [PATCH] #396 fix - Highlight of current section, changed Packs listing to include necessary codes for licenses
---
securis/src/main/webapp/js/licenses.js | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/securis/src/main/webapp/js/licenses.js b/securis/src/main/webapp/js/licenses.js
index 4d52d25..b27e52f 100644
--- a/securis/src/main/webapp/js/licenses.js
+++ b/securis/src/main/webapp/js/licenses.js
@@ -427,6 +427,10 @@
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);
+ });
}, refFields);
});
@@ -440,7 +444,12 @@
// the new pack
$scope.pack = null;
- $scope.packs = Packs.getPacksList();
+ $scope.packs = Packs.getPacksList(function(list) {
+ angular.forEach(list, 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() {
@@ -609,6 +618,28 @@
return label;
}
+ $scope.getOrganizationCode = function(orgId) {
+ return $scope._getCodeFromId('organization_id', orgId);
+ }
+
+ $scope.getLicenseTypeCode = function(ltId) {
+ return $scope._getCodeFromId('license_type_id', ltId);
+ }
+
+ $scope._getCodeFromId = function(field, myid) {
+ if (!myid) {
+ return null;
+ }
+ var list = $scope.refs[field];
+ for(var i = 0; list && i < list.length; i++) {
+ var elem = list[i];
+ if (elem.id === myid) {
+ return elem.code;
+ }
+ }
+ return null;
+ }
+
$scope.createMetadataRow = function() {
if (!$scope.formu.metadata) {
$scope.formu.metadata = [];
--
Gitblit v1.3.2