From: Bill Erickson <berick@esilibrary.com>
Date: Tue, 20 Dec 2011 15:48:42 +0000 (-0500)
Subject: Revert "Permission to control patron-collections-exempt"
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=360759acc913a0d8e65d6513f1176a849f990d80;p=working%2FEvergreen.git

Revert "Permission to control patron-collections-exempt"

This reverts commit 6719fcef8faceab7a355a9f405eb31d6cbda9190.

Conflicts:

	Open-ILS/src/sql/Pg/950.data.seed-values.sql
	Open-ILS/web/js/ui/default/actor/user/register.js

Signed-off-by: Bill Erickson <berick@esilibrary.com>
---

diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index 3baf2abf63..a5cc366972 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -1913,7 +1913,6 @@ INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable)
 			'UPDATE_HOLD_REQUEST_TIME',
 			'UPDATE_NET_ACCESS_LEVEL',
 			'VIEW_CIRC_MATRIX_MATCHPOINT',
-            'UPDATE_PATRON_COLLECTIONS_EXEMPT',
 			'VIEW_HOLD_MATRIX_MATCHPOINT');
 
 INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable)
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 f74b110651..b75985c798 100644
--- a/Open-ILS/web/js/ui/default/actor/user/register.js
+++ b/Open-ILS/web/js/ui/default/actor/user/register.js
@@ -595,10 +595,6 @@ function uEditDrawSettingRow(tbody, dividerRow, template, stype) {
     dojo.connect(cb, 'onChange', function(newVal) { userSettingsToUpdate[stype.name()] = newVal; });
     tbody.insertBefore(row, dividerRow.nextSibling);
     openils.Util.show(row, 'table-row');
-
-    if(stype.name() == 'circ.collections.exempt') {
-        checkCollectionsExemptPerm(cb);
-    }
 }
 
 function uEditUpdateUserSettings(userId) {
@@ -905,21 +901,6 @@ function checkClaimsNoCheckoutCountPerm() {
     );
 }
 
-var collectExemptCBox;
-function checkCollectionsExemptPerm(cbox) {
-    if(cbox) collectExemptCBox = cbox;
-    new openils.User().getPermOrgList(
-        'UPDATE_PATRON_COLLECTIONS_EXEMPT',
-        function(orgList) { 
-            if(orgList.indexOf(patron.home_ou()) == -1) 
-                collectExemptCBox.attr('disabled', true);
-            else
-                collectExemptCBox.attr('disabled', false);
-        },
-        true, 
-        true
-    );
-}
 
 function usePhonePw(newVal) {
     if(newVal && newVal.length >= 4) {
@@ -1118,7 +1099,6 @@ function attachWidgetEvents(fmcls, fmfield, widget) {
                     function(newVal) { 
                         checkClaimsReturnCountPerm(); 
                         checkClaimsNoCheckoutCountPerm();
-                        checkCollectionsExemptPerm();
                     }
                 );
                 return;