JBAS-1132 Pending users columns cleanup + addresses

Signed-off-by: Bill Erickson <berickxx@gmail.com>

diff --git a/Open-ILS/xul/staff_client/server/patron/staged.js b/Open-ILS/xul/staff_client/server/patron/staged.js
index e93263f..7b48fb1 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/staged.js
+++ b/Open-ILS/xul/staff_client/server/patron/staged.js
@@ -217,9 +217,58 @@ function init_list() {
             {
                 'columns' : list.fm_columns(
                     'stgu', {
-                        'stgu_ident_type' : { 'render' : function(my) { return data.hash.cit[ my.stgu.ident_type() ].name(); } },
-                        'stgu_home_ou' : { 'render' : function(my) { return data.hash.aou[ my.stgu.home_ou() ].shortname(); } }
+                        '*' : {remove_virtual : true},
+                        stgu_ident_type : {render : function(my) { 
+                            return data.hash.cit[ my.stgu.ident_type() ].name()}},
+                        stgu_home_ou    : {render : function(my) { 
+                            return data.hash.aou[ my.stgu.home_ou() ].shortname()}},
+                        stgu_usrname    : {hidden : true},
+                        stgu_email      : {hidden : true},
+                        stgu_complete   : {hidden : true},
+                        stgu_evening_phone : {hidden : true},
+                        stgu_profile    : {hidden : true},
+                        stgu_passwd     : {hidden : true},
+                        stgu_ident_type : {hidden : true},
+                        stgu_row_id     : {hidden : true},
+                        stgu_row_date: {hidden : true}
                     }
+                ).concat(
+                    list.fm_columns(
+                        'stgba', {
+                            '*' : {
+                                expanded_label : true, 
+                                remove_virtual : true
+                            },
+                            stgba_row_id   : {remove_me : true},
+                            stgba_row_date : {remove_me : true},
+                            stgba_complete : {remove_me : true},
+                            stgba_usrname  : {remove_me : true},
+                            stgba_street2  : {hidden : true},
+                            stgba_state    : {hidden : true},
+                            stgba_county   : {hidden : true},
+                            stgba_country  : {hidden : true},
+                            stgba_post_code: {hidden : true},
+                        }
+                    )
+                ).concat(
+                    list.fm_columns(
+                        'stgma', {
+                            '*' : {
+                                expanded_label : true, 
+                                remove_virtual : true,
+                            },
+                            stgma_street2  : {hidden : true},
+                            stgma_city     : {hidden : true},
+                            stgma_county   : {hidden : true},
+                            stgma_state    : {hidden : true},
+                            stgma_country  : {hidden : true},
+                            stgma_post_code: {hidden : true},
+                            stgma_row_id   : {remove_me : true},
+                            stgma_row_date : {remove_me : true},
+                            stgma_complete : {remove_me : true},
+                            stgma_usrname  : {remove_me : true}
+                        }
+                    )
                 ),
                 'retrieve_row' : retrieve_row,
                 'on_select' : handle_selection,
@@ -267,7 +316,9 @@ function populate_list() {
             var row_params = {
                 'row' : {
                     'my' : {
-                        'stgu' : blob.user
+                        'stgu' : blob.user,
+                        'stgma' : blob.mailing_addresses[0],
+                        'stgba' : blob.billing_addresses[0]
                     }
                 }
             };