Revert "LP#1406387 Fix for Holds Placement Advanced Options"

Not working for us yet, so reverting.

This reverts commit 2322ee5ae9cbe3caefb6998d62c3716cf40411a3.

Conflicts:
	Open-ILS/src/templates/opac/parts/place_hold.tt2

diff --git a/Open-ILS/src/templates/opac/parts/place_hold.tt2 b/Open-ILS/src/templates/opac/parts/place_hold.tt2
index 523bbda..0ce3bd5 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/place_hold.tt2
+++ b/Open-ILS/src/templates/opac/parts/place_hold.tt2
@@ -19,18 +19,6 @@
         %]
         <input type="hidden" name="redirect_to" value="[% redirect | html %]" />
         <input type="hidden" name="hold_source_page" value="[% CGI.param('hold_source_page') | html %]" />
-        [%
-            usr_barcode = CGI.param('usr_barcode') | html;
-            is_requestor = CGI.param('is_requestor');
-
-           IF is_requestor == '';
-               is_requetor = '0';
-           END;
-
-           IF is_requestor == '0' && usr_barcode == ctx.staff_recipient.card.barcode;
-               usr_barcode = '';
-           END;
-        %]
 
         [% IF ctx.is_staff %]
         <p class="staff-hold">

diff --git a/Open-ILS/web/js/ui/default/opac/staff.js b/Open-ILS/web/js/ui/default/opac/staff.js
index fff3aea..d281ca2 100644 (file)
--- a/Open-ILS/web/js/ui/default/opac/staff.js
+++ b/Open-ILS/web/js/ui/default/opac/staff.js
@@ -42,13 +42,6 @@ function staff_hold_usr_barcode_changed(isload) {
     }
 
     if (!window.xulG) return;
- 
-    var adv_link = document.getElementById('advanced_hold_link');
-    if (adv_link) {
-        adv_link.setAttribute('href', adv_link.getAttribute('href').replace(/&?is_requestor=[01]/,''));
-        var is_requestor = document.getElementById('hold_usr_is_requestor').checked ? 1 : 0;
-        adv_link.setAttribute('href', adv_link.getAttribute('href') + '&is_requestor=' + is_requestor.toString());
-    }
 
     var cur_hold_barcode = undefined;
     var barcode = isload;
@@ -163,21 +156,6 @@ window.onload = function() {
     // record details page events
 
     setTimeout(function() {
-
-        if (location.href.match(/is_requestor=[01]/)) {
-            var loc = location.href;
-            var is_req_match = new RegExp("is_requestor=[01]");
-            var is_req = is_req_match.exec(loc).toString();
-            is_req = is_req.replace(/is_requestor=/, '');
-            if (is_req == "1") {
-                document.getElementById('hold_usr_is_requestor').checked = 'checked';
-                document.getElementById('hold_usr_input').disabled = true;
-            } else {
-                document.getElementById('hold_usr_is_requestor_not').checked = 'checked';
-                document.getElementById('hold_usr_input').disabled = false;
-            }
-        }
-
         var rec = location.href.match(/\/opac\/record\/(\d+)/);
         if(rec && rec[1]) { 
             runEvt('rdetail', 'recordRetrieved', rec[1]);