From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Thu, 20 May 2010 04:54:03 +0000 (+0000)
Subject: change this id to avoid a collision when patron and circ columns are combined in... 
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=239005dc83a777b07f74d4d3b901621e55fc97d3;p=evergreen%2Fpines.git

change this id to avoid a collision when patron and circ columns are combined in one list (such as with the Check-In interface)

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

diff --git a/Open-ILS/xul/staff_client/server/patron/search_result.js b/Open-ILS/xul/staff_client/server/patron/search_result.js
index 3cc26eca0c..cfb1eee519 100644
--- a/Open-ILS/xul/staff_client/server/patron/search_result.js
+++ b/Open-ILS/xul/staff_client/server/patron/search_result.js
@@ -40,7 +40,7 @@ patron.search_result.prototype = {
             },
             {
                 'except_these' : [
-                    'barcode',
+                    'au_barcode',
                 ]
             }
         );
diff --git a/Open-ILS/xul/staff_client/server/patron/util.js b/Open-ILS/xul/staff_client/server/patron/util.js
index 9b0ce7c2ec..8bb16b35b6 100644
--- a/Open-ILS/xul/staff_client/server/patron/util.js
+++ b/Open-ILS/xul/staff_client/server/patron/util.js
@@ -371,7 +371,7 @@ patron.util.columns = function(modify,params) {
 
     var c = [
         {
-            'persist' : 'hidden width ordinal', 'id' : 'barcode', 'label' : commonStrings.getString('staff.card_barcode_label'), 'flex' : 1, 
+            'persist' : 'hidden width ordinal', 'id' : 'au_barcode', 'label' : commonStrings.getString('staff.card_barcode_label'), 'flex' : 1, 
             'primary' : false, 'hidden' : true, 'editable' : false, 'render' : function(my) { return my.au.card().barcode(); }
         },
         {