From edd47c68c6a08bd756d96213c38e896a0a257bd1 Mon Sep 17 00:00:00 2001
From: Roberto Sánchez <roberto.sanchez@curisit.net>
Date: Mon, 13 Jan 2014 18:12:51 +0000
Subject: [PATCH] #394 feature - Several fixes related with form management
---
securis/src/main/resources/static/js/catalogs.js | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/securis/src/main/resources/static/js/catalogs.js b/securis/src/main/resources/static/js/catalogs.js
index 518fd65..77ad975 100644
--- a/securis/src/main/resources/static/js/catalogs.js
+++ b/securis/src/main/resources/static/js/catalogs.js
@@ -183,13 +183,15 @@
$q.all(promises).then(function() {
for (var k in refs) {
- var pk = that.getPk(that.getMetadata(that.getField(k).resource))
+ var field = that.getField(k);
+ var pk = that.getPk(that.getMetadata(field.resource))
console.log('PK field for ' + k + ' is ' + pk)
var comboData = []
refs[k].forEach(function(row) {
+ console.log('field.resource !== _current.resource: ' + field.resource +' '+ _current.resource)
comboData.push({
id: row[pk],
- label: row.label || row.name || row.code || row.first_name + ' ' + row.last_name
+ label: row.label || row.name || row.code || row.first_name + ' ' + (row.last_name || '')
});
})
refs[k] = comboData;
--
Gitblit v1.3.2