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

[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  6eac593d2abbb661b58ed8b91c09f91cc58c03f3 (commit)
      from  0817ec391611a1a47923f1c44fd5b117a0967793 (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 6eac593d2abbb661b58ed8b91c09f91cc58c03f3
Author: Mike Rylander <mrylander at gmail.com>
Date:   Tue Sep 20 10:55:55 2011 -0400

    Do not overwrite controlmap entries, but extend them (Floating Subdivisions!)
    
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/web/js/dojo/openils/AuthorityControlSet.js b/Open-ILS/web/js/dojo/openils/AuthorityControlSet.js
index 36ac521..c6c6c00 100644
--- a/Open-ILS/web/js/dojo/openils/AuthorityControlSet.js
+++ b/Open-ILS/web/js/dojo/openils/AuthorityControlSet.js
@@ -140,9 +140,15 @@ if(!dojo._hasResource["openils.AuthorityControlSet"]) {
 
                     // build the authority_tag_map
                     dojo.forEach( openils.AuthorityControlSet._controlsets[''+cs.id()].bib_fields, function (bf) {
-                        openils.AuthorityControlSet._controlsets[''+cs.id()].control_map[bf.tag()] = {};
+
+                        if (!openils.AuthorityControlSet._controlsets[''+cs.id()].control_map[bf.tag()])
+                            openils.AuthorityControlSet._controlsets[''+cs.id()].control_map[bf.tag()] = {};
+
                         dojo.forEach( bf.authority_field().sf_list().split(''), function (sf_code) {
-                            openils.AuthorityControlSet._controlsets[''+cs.id()].control_map[bf.tag()][sf_code] = {};
+
+                            if (!openils.AuthorityControlSet._controlsets[''+cs.id()].control_map[bf.tag()][sf_code])
+                                openils.AuthorityControlSet._controlsets[''+cs.id()].control_map[bf.tag()][sf_code] = {};
+
                             openils.AuthorityControlSet._controlsets[''+cs.id()].control_map[bf.tag()][sf_code][bf.authority_field().tag()] = sf_code;
                         });
                     });

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

Summary of changes:
 .../web/js/dojo/openils/AuthorityControlSet.js     |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS