showing fewer fields by default on user object, turned workstation just into the...

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

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Circ/Money.pm b/Open-ILS/src/perlmods/OpenILS/Application/Circ/Money.pm
index d8bac45..4f627e4 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Circ/Money.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Circ/Money.pm
@@ -489,9 +489,12 @@ sub desk_payments {
        my $e = new_editor(authtoken=>$auth);
        return $e->event unless $e->checkauth;
        return $e->event unless $e->allowed('VIEW_TRANSACTION', $org);
-       return $U->storagereq(
+       my $data = $U->storagereq(
                'open-ils.storage.money.org_unit.desk_payments.atomic',
                $org, $start_date, $end_date );
+
+       $_->workstation( $_->workstation->name ) for(@$data);
+       return $data;
 }
 
 
@@ -505,9 +508,16 @@ sub user_payments {
        my $e = new_editor(authtoken=>$auth);
        return $e->event unless $e->checkauth;
        return $e->event unless $e->allowed('VIEW_TRANSACTION', $org);
-       return $U->storagereq(
+       my $data = $U->storagereq(
                'open-ils.storage.money.org_unit.user_payments.atomic',
                $org, $start_date, $end_date );
+       for(@$data) {
+               $_->usr->card(
+                       $e->retrieve_actor_card($_->usr->card)->barcode);
+               $_->usr->home_ou(
+                       $e->retrieve_actor_org_unit($_->usr->home_ou)->shortname);
+       }
+       return $data;
 }
 
 

diff --git a/Open-ILS/web/opac/common/js/fm_table_conf.js b/Open-ILS/web/opac/common/js/fm_table_conf.js
index fcfd0d1..1008061 100644 (file)
--- a/Open-ILS/web/opac/common/js/fm_table_conf.js
+++ b/Open-ILS/web/opac/common/js/fm_table_conf.js
@@ -51,14 +51,9 @@ var FM_TABLE_DISPLAY = {
                fields : [
                        'card',
                        'email',
-                       'prefix',
                        'first_given_name',
-                       'second_given_name',
                        'family_name',
-                       'suffix',
-                       'day_phone',
                        'home_ou',
-                       'dob'
                ]
        },
        aws : {