[open-ils-commits] [GIT] Evergreen ILS branch rel_2_0 updated. 2b9700d77028c941f4f41ac5433eb56dd3c11316

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_2_0 has been updated
       via  2b9700d77028c941f4f41ac5433eb56dd3c11316 (commit)
       via  069dc3e92e9ef89aade06ab592dc9fc4b219a547 (commit)
       via  7d28c36b9e1eba18852e07476e0c28c4655c8921 (commit)
      from  e7ceab3826adc79b9cdb708ca076f46aa9771c20 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2b9700d77028c941f4f41ac5433eb56dd3c11316
Author: Ben Shum <bshum at biblio.org>
Date:   Tue Aug 2 11:15:57 2011 -0400

    #LP801961, error when running edi_fetcher.pl
    
    This patch addresses an error encountered when running edi_fetcher.pl.
    The method "is_dir" should be just plain "dir" in RemoteAccount.pm file.
    Signed-off-by: Ben Shum <bshum at biblio.org>
    
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/src/perlmods/OpenILS/Utils/RemoteAccount.pm b/Open-ILS/src/perlmods/OpenILS/Utils/RemoteAccount.pm
index d8c399c..164e227 100644
--- a/Open-ILS/src/perlmods/OpenILS/Utils/RemoteAccount.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Utils/RemoteAccount.pm
@@ -612,7 +612,7 @@ sub ls_ftp {   # returns full path like: dir/path/file.ext
             next;
         }
         if ($dirtarget and $dirtarget ne '.' and $dirtarget ne './' and
-            $self->_ftp->is_dir($dirtarget)) {
+            $self->_ftp->dir($dirtarget)) {
             foreach my $file (@part) {   # we ensure full(er) path
                 $file =~ /^$dirtarget\// and next;
                 $logger->debug("ls_ftp: prepending $dirtarget/ to $file");

commit 069dc3e92e9ef89aade06ab592dc9fc4b219a547
Author: Jason Stephenson <jstephenson at mvlc.org>
Date:   Tue Aug 9 15:49:21 2011 -0400

    Branchify second patch from James Fournie on LP bug #791941.
    
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/web/js/ui/default/actor/user/register.js b/Open-ILS/web/js/ui/default/actor/user/register.js
index 3832c97..56126b0 100644
--- a/Open-ILS/web/js/ui/default/actor/user/register.js
+++ b/Open-ILS/web/js/ui/default/actor/user/register.js
@@ -699,6 +699,11 @@ function fleshFMRow(row, fmcls, args) {
         wargs.forceSync = false;
     }
 
+    if(fmcls == 'au' && fmfield == 'home_ou'){
+	wargs.labelAttr = 'name';
+	wargs.searchAttr = 'name';
+    }
+
     var widget = new openils.widget.AutoFieldWidget(wargs);
     widget.build(
         function(w, ww) {

commit 7d28c36b9e1eba18852e07476e0c28c4655c8921
Author: Jason Stephenson <jstephenson at mvlc.org>
Date:   Tue Aug 9 15:48:46 2011 -0400

    Branchify first patch from James Fournie on LP bug #791941.
    
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/web/js/dojo/openils/widget/AutoFieldWidget.js b/Open-ILS/web/js/dojo/openils/widget/AutoFieldWidget.js
index 98b702e..d9fad80 100644
--- a/Open-ILS/web/js/dojo/openils/widget/AutoFieldWidget.js
+++ b/Open-ILS/web/js/dojo/openils/widget/AutoFieldWidget.js
@@ -557,8 +557,8 @@ if(!dojo._hasResource['openils.widget.AutoFieldWidget']) {
             dojo.require('fieldmapper.OrgUtils');
             dojo.require('openils.widget.FilteringTreeSelect');
             this.widget = new openils.widget.FilteringTreeSelect(this.dijitArgs, this.parentNode);
-            this.widget.searchAttr = 'shortname';
-            this.widget.labelAttr = 'shortname';
+            this.widget.searchAttr = this.searchAttr || 'shortname';
+            this.widget.labelAttr = this.searchAttr || 'shortname';
             this.widget.parentField = 'parent_ou';
             var user = new openils.User();
 

-----------------------------------------------------------------------

Summary of changes:
 .../src/perlmods/OpenILS/Utils/RemoteAccount.pm    |    2 +-
 .../web/js/dojo/openils/widget/AutoFieldWidget.js  |    4 ++--
 Open-ILS/web/js/ui/default/actor/user/register.js  |    5 +++++
 3 files changed, 8 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Evergreen ILS