[open-ils-commits] r13247 - in trunk/Open-ILS: src/support-scripts/test-scripts xul/staff_client/server/patron (erickson)

[svn at svn.open-ils.org]

Author: erickson
Date: 2009-05-26 23:53:36 -0400 (Tue, 26 May 2009)
New Revision: 13247

Modified:
   trunk/Open-ILS/src/support-scripts/test-scripts/print_po.pl
   trunk/Open-ILS/xul/staff_client/server/patron/summary_overlay_horiz.xul
Log:
oops, over-enthusiastic batch merge, rolling back the extra files

Modified: trunk/Open-ILS/src/support-scripts/test-scripts/print_po.pl
===================================================================
--- trunk/Open-ILS/src/support-scripts/test-scripts/print_po.pl	2009-05-27 03:48:28 UTC (rev 13246)
+++ trunk/Open-ILS/src/support-scripts/test-scripts/print_po.pl	2009-05-27 03:53:36 UTC (rev 13247)
@@ -18,27 +18,14 @@
 oils_login($username, $password);
 my $e = OpenILS::Utils::CStoreEditor->new;
 
-use OpenILS::Utils::Fieldmapper;
-$e->xact_begin;
-my $bt = $e->retrieve_acq_currency_type('USD');
-$bt->label('vvvv');
-my $resp = $e->update_acq_currency_type($bt);
-print Dumper($resp);
-$e->xact_rollback;
-
-
 my $po = $e->retrieve_acq_purchase_order($po_id) or oils_event_die($e->event);
 my $orgs = $apputils->get_org_ancestors($po->ordering_agency);
-$orgs = $e->search_actor_org_unit([{id => $orgs}, {flesh => 1, flesh_fields => {aou => ['ou_type']}}]);
-$orgs = [ sort { $a->ou_type->depth cmp $b->ou_type->depth } @$orgs ];
-my $def;
-for my $org (reverse @$orgs) { 
-    $def = $e->search_action_trigger_event_definition({hook => $hook, owner => $org->id})->[0];
-    last if $def;
-}
+my $defs = $e->search_action_trigger_event_definition({hook => $hook, owner => $orgs});
+$defs = [sort { $a->id cmp $b->id } @$defs ]; # this is a brittle hack, but.. meh
+my $def = pop @$defs;
+print "using def " . $def->id . " at org_unit " . $def->owner . "\n";
 
 die "No event_definition found with hook $hook\n" unless $def;
-print "using def " . $def->id . " at org_unit " . $def->owner . "\n";
 
 my $event_id = $apputils->simplereq(
     'open-ils.trigger', 
@@ -60,8 +47,6 @@
     ]
 );
 
-print "$event\n";
-
 if($event->template_output) {
     print $event->template_output->data . "\n";
 }

Modified: trunk/Open-ILS/xul/staff_client/server/patron/summary_overlay_horiz.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/patron/summary_overlay_horiz.xul	2009-05-27 03:48:28 UTC (rev 13246)
+++ trunk/Open-ILS/xul/staff_client/server/patron/summary_overlay_horiz.xul	2009-05-27 03:53:36 UTC (rev 13247)
@@ -25,7 +25,7 @@
                     <column/>
                 </columns>
                 <rows>
-                    <row hidden='true'>
+                    <row>
                         <label id="PatronSummaryContact_date_of_birth_label" click_to_hide_dob="true" class="text_left dob label click_link" value="&staff.patron_display.date_of_birth.label;"/>
                         <label id="patron_date_of_birth" class="dob value" hide_value="true" persist="hide_value"/><!-- FIXME: persist doesn't work for this -->
                     </row>