Merge r13574 from trunk: fix for reporter due to removal of virtual attribute

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_0@13576 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/web/reports/xul/source-setup.js b/Open-ILS/web/reports/xul/source-setup.js
index 018e101..7a9ca84 100644 (file)
--- a/Open-ILS/web/reports/xul/source-setup.js
+++ b/Open-ILS/web/reports/xul/source-setup.js
@@ -240,7 +240,7 @@ function populateDetailTree (tcNode, c, item) {
        var fullpath = item.getAttribute('fullpath');
        var reltype = item.getAttribute('reltype');
 
-       var fields = filterByAttributeNS(c.getElementsByTagName('field'),persistNS, 'virtual','false');
+       var fields = nodelistToArray(c.getElementsByTagName('field'));
        fields.sort( sortLabels );
 
        var id = c.getAttribute('id');

diff --git a/Open-ILS/web/reports/xul/utilities.js b/Open-ILS/web/reports/xul/utilities.js
index a7ad73c..c8fc794 100644 (file)
--- a/Open-ILS/web/reports/xul/utilities.js
+++ b/Open-ILS/web/reports/xul/utilities.js
@@ -80,4 +80,11 @@ function getKeys (hash) {
         return k;
 }
 
-
+/* This just lets us return an array consistent with the filterBy* functions */
+function nodelistToArray (nodes) {
+        var aResponse = [];
+        for ( var i = 0; i < nodes.length; i++ ) {
+                aResponse.push(nodes[i]);
+        }
+        return aResponse;
+}