[open-ils-commits] [GIT] Evergreen ILS branch master updated. f4d868cf5bafb01dd52b22929aaba84eba469cfc

[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, master has been updated
       via  f4d868cf5bafb01dd52b22929aaba84eba469cfc (commit)
       via  9fb3d2035f193dd4e0bdcec9f74cdea8a2d7038c (commit)
      from  20be08f2bbb02941f72435fc1ced5c08140f595e (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 f4d868cf5bafb01dd52b22929aaba84eba469cfc
Author: Jason Stephenson <jstephenson at mvlc.org>
Date:   Tue Aug 9 15:43:12 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 be1c111..ac9b45c 100644
--- a/Open-ILS/web/js/ui/default/actor/user/register.js
+++ b/Open-ILS/web/js/ui/default/actor/user/register.js
@@ -820,6 +820,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 9fb3d2035f193dd4e0bdcec9f74cdea8a2d7038c
Author: Jason Stephenson <jstephenson at mvlc.org>
Date:   Tue Aug 9 15:40:41 2011 -0400

    Branchify the 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 858ae70..c33b5e1 100644
--- a/Open-ILS/web/js/dojo/openils/widget/AutoFieldWidget.js
+++ b/Open-ILS/web/js/dojo/openils/widget/AutoFieldWidget.js
@@ -593,8 +593,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:
 .../web/js/dojo/openils/widget/AutoFieldWidget.js  |    4 ++--
 Open-ILS/web/js/ui/default/actor/user/register.js  |    5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS