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

[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  7543140d57b955bdfb45f0bffa0fbe31d9a1e1da (commit)
       via  888bcf06187a1b7ad128d486cc17f4038c0fcfd2 (commit)
      from  305eef7176e2924e980428a011ee8bc932bff0e7 (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 7543140d57b955bdfb45f0bffa0fbe31d9a1e1da
Merge: 888bcf0 305eef7
Author: Bill Erickson <berick at esilibrary.com>
Date:   Fri Jun 10 11:48:53 2011 -0400

    Merge branch 'master' of git.evergreen-ils.org:Evergreen


commit 888bcf06187a1b7ad128d486cc17f4038c0fcfd2
Author: Thomas Berezansky <tsbere at mvlc.org>
Date:   Fri Jun 10 09:22:56 2011 -0400

    Mark invalid home ous as such in patron editor
    
    Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
    Signed-off-by: Bill Erickson <berick at esilibrary.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 1698cb1..43864d3 100644
--- a/Open-ILS/web/js/ui/default/actor/user/register.js
+++ b/Open-ILS/web/js/ui/default/actor/user/register.js
@@ -45,6 +45,7 @@ var stageUser;
 var optInSettings;
 var allCardsTemplate;
 var uEditCloneCopyAddr; // if true, copy addrs on clone instead of link
+var homeOuTypes = {};
 
 var dupeUsrname = false;
 var dupeBarcode = false;
@@ -197,6 +198,12 @@ function load() {
         fieldDoc[doc.fm_class()][doc.field()] = doc;
     }
 
+    list = pcrud.search('aout', {can_have_users: 'true'});
+    for(var i in list) {
+        var type = list[i];
+        homeOuTypes[type.id()] = true;
+    }
+
     tbody = dojo.byId('uedit-tbody');
 
     if(orgSettings['ui.patron.edit.default_suggested'])
@@ -1065,6 +1072,15 @@ function attachWidgetEvents(fmcls, fmfield, widget) {
                 return;
 
             case 'home_ou':
+                widget.widget.isValid = function() {
+                    if(this.item) {
+                        if(homeOuTypes[this.store.getValue(this.item, 'ou_type')]) {
+                            return true;
+                        }
+                        return false;
+                    }
+                    return true;
+                };
                 dojo.connect(widget.widget, 'onChange',
                     function(newVal) { 
                         checkClaimsReturnCountPerm(); 

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

Summary of changes:
 Open-ILS/web/js/ui/default/actor/user/register.js |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Evergreen ILS