From 7686a892d556333194349f73fee3a268b6202d66 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Wed, 15 Oct 2014 16:52:56 +0000
Subject: [PATCH] #2021 config - Fixed some catalogs, LicenseType and Users
---
securis/src/main/resources/static/js/catalogs.js | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/securis/src/main/resources/static/js/catalogs.js b/securis/src/main/resources/static/js/catalogs.js
index bd4541e..298af83 100644
--- a/securis/src/main/resources/static/js/catalogs.js
+++ b/securis/src/main/resources/static/js/catalogs.js
@@ -215,7 +215,7 @@
refs[field.name] = comboData;
})
}
- this.loadRefs = function(refs, refsFields) {
+ this.loadRefs = function(callback, refsFields) {
if (!refsFields || refsFields.length === 0) {
if (!_current)
throw new Error('There is no current catalog selected');
@@ -229,6 +229,7 @@
var that = this;
var promises = []
+ var refs = []
refsFields.forEach(function(f) {
var resource = that
.getResource(f.resource);
@@ -239,9 +240,7 @@
$q.all(promises)
.then(function() {
- for(var i in refsFields) {
- //for ( var k in refs) {
- var rf = refsFields[i];
+ refsFields.forEach(function(rf) {
var cat = that.getResource(rf.resource);
var pk = that.getPk(that.getMetadata(rf.resource))
//console.log('PK field for ' + rf.name + ' is ' + pk)
@@ -258,14 +257,14 @@
});
})
refs[rf.name] = comboData;
- }
+ });
+ // Next lines are to load special catalogs with predefined values, just like user roles
_current && _current.fields.forEach(function(f) {
if (f.values)
refs[f.name] = f.values;
});
+ callback(refs);
})
-
- return refs;
}
} ])
--
Gitblit v1.3.2