[open-ils-commits] r9670 - in branches/acq-experiment: . Open-ILS/src/extras

[svn at svn.open-ils.org]

Author: erickson
Date: 2008-05-22 15:42:57 -0400 (Thu, 22 May 2008)
New Revision: 9670

Modified:
   branches/acq-experiment/
   branches/acq-experiment/Open-ILS/src/extras/org_tree_js.pl
Log:
Merged revisions 9669 via svnmerge from 
svn://svn.open-ils.org/ILS/trunk

........
  r9669 | erickson | 2008-05-22 15:41:29 -0400 (Thu, 22 May 2008) | 1 line
  
  putting shortname into the generated org tree
........



Property changes on: branches/acq-experiment
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk:1-9654
   + /trunk:1-9669

Modified: branches/acq-experiment/Open-ILS/src/extras/org_tree_js.pl
===================================================================
--- branches/acq-experiment/Open-ILS/src/extras/org_tree_js.pl	2008-05-22 19:41:29 UTC (rev 9669)
+++ branches/acq-experiment/Open-ILS/src/extras/org_tree_js.pl	2008-05-22 19:42:57 UTC (rev 9670)
@@ -50,9 +50,9 @@
 
 my @array;
 for my $o (@$tree) {
-	my ($i,$t,$p,$n,$v) = ($o->id,$o->ou_type,$o->parent_ou,val($o->name),val($o->opac_visible));
+	my ($i,$t,$p,$n,$v,$s) = ($o->id,$o->ou_type,$o->parent_ou,val($o->name),val($o->opac_visible),val($o->shortname));
     $p ||= 'null';
-	push @array, "[$i,$t,$p,$n,$v]";
+	push @array, "[$i,$t,$p,$n,$v,$s]";
 }
 
 $pile .= join ',', @array;