[open-ils-commits] [GIT] Evergreen ILS branch rel_2_1 updated. 667ff193d7f85d6a01c823b8bfd5ee64f80f9a51

[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_1 has been updated
       via  667ff193d7f85d6a01c823b8bfd5ee64f80f9a51 (commit)
       via  7186e2a54d6c72a8b22eb71582c982f8cf545025 (commit)
      from  5a28429fa191f718591fa7e46208870a6196a3bf (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 667ff193d7f85d6a01c823b8bfd5ee64f80f9a51
Author: Jason Stephenson <jstephenson at mvlc.org>
Date:   Tue Aug 9 15:46:30 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 8e3c1dd..ddb1de0 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 7186e2a54d6c72a8b22eb71582c982f8cf545025
Author: Jason Stephenson <jstephenson at mvlc.org>
Date:   Tue Aug 9 15:45:38 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 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