From cbcdf74502de5016ff6a23b7b9961d8e5a09133d Mon Sep 17 00:00:00 2001
From: James Fournie <jfournie@sitka.bclibraries.ca>
Date: Mon, 13 Feb 2012 09:21:59 -0800
Subject: [PATCH] Fix secondary patron editor to line up with what we have in
 reality - fixes "Secondary Groups Saved" message from happening all the time

Signed-off-by: James Fournie <jfournie@sitka.bclibraries.ca>
---
 Open-ILS/web/js/ui/default/actor/user/register.js | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

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 c3c8dc1bc4..41d4940b7f 100644
--- a/Open-ILS/web/js/ui/default/actor/user/register.js
+++ b/Open-ILS/web/js/ui/default/actor/user/register.js
@@ -48,7 +48,7 @@ var stageUser;
 var optInSettings;
 var allCardsTemplate;
 var secondaryGroupsTemplate;
-var editSecondaryGroups;
+var secondaryGroupsChanged = false;
 var uEditCloneCopyAddr; // if true, copy addrs on clone instead of link
 var homeOuTypes = {};
 var holdPickupTypes = {};
@@ -470,6 +470,8 @@ function drawSecondaryGroups() {
 
     tbody.appendChild(row);
 
+    secondaryGroupsChanged = true;
+
     secondaryGroupsDialog.show();
 }
 
@@ -526,10 +528,8 @@ function saveSecondaryGroups(){
         ['open-ils.actor', 'open-ils.actor.user.set_groups'],
         { params : [openils.User.authtoken, patron.id(), groupids ] }
     );
-    if(data){
-        alert('Secondary Groups Saved');
-    } else {
-        alert('Error saving groups.  Contact your sysadmin.');
+    if(!data){
+        alert('Error saving secondary groups, but patron record likely saved successfully.  Contact support@sitka.bclibraries.ca and tell them you saw this.');
     }
     secondaryGroupsDialog.hide()
 }
@@ -1341,10 +1341,12 @@ function checkSecondaryGroupsPerm() {
     new openils.User().getPermOrgList(
         'CREATE_USER_GROUP_LINK',
         function(orgList) {
-            if(orgList.indexOf(patron.home_ou()) == -1)
+            if(orgList.indexOf(patron.home_ou()) == -1) {
                 dojo.addClass(dojo.byId('ueditSecondaryGrpButton'), 'hidden');
-            else
+                secondaryGroupsChanged = false;
+            } else {
                 dojo.removeClass(dojo.byId('ueditSecondaryGrpButton'), 'hidden');
+            }
         },
         true,
         true
@@ -2060,8 +2062,9 @@ function _uEditSave(doClone) {
             }
         }
     );
-
-    saveSecondaryGroups();
+    if(secondaryGroupsChanged){
+        saveSecondaryGroups();
+    }
 }
 
 function uUpdateContactInvalidators() {
-- 
2.11.0