From 3745fe23d7ef465a1f6164ec67b9215af3a4c0f7 Mon Sep 17 00:00:00 2001
From: Jason Etheridge <jason@esilibrary.com>
Date: Thu, 28 Jul 2011 07:53:56 -0400
Subject: [PATCH] show acq user requests action from lineitems in lists
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
---
Open-ILS/src/templates/acq/common/li_table.tt2 | 1 +
Open-ILS/src/templates/acq/picklist/user_request.tt2 | 2 +-
Open-ILS/web/js/ui/default/acq/common/li_table.js | 3 +++
Open-ILS/web/js/ui/default/acq/picklist/user_request.js | 9 ++-------
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/Open-ILS/src/templates/acq/common/li_table.tt2 b/Open-ILS/src/templates/acq/common/li_table.tt2
index 268e9873ad..8f078aba07 100644
--- a/Open-ILS/src/templates/acq/common/li_table.tt2
+++ b/Open-ILS/src/templates/acq/common/li_table.tt2
@@ -105,6 +105,7 @@
<span name="worksheet"> | <a title='Generate Worksheet' name="worksheet_link" href="javascript:void(0);">✍ worksheet</a></span>
<span name='pl' class='hidden'> | <a title='Select List' name='pl_link' href='javascript:void(0);'>❖ </a></span>
<span name='po' class='hidden'> | <a title='Purchase Order' name='po_link' href='javascript:void(0);'>⌘ </a></span>
+ <span name="show_requests"> | <a title='Patron Requests' name="show_requests_link" href="javascript:void(0);">requests</a></span>
</td>
</tr>
</tbody>
diff --git a/Open-ILS/src/templates/acq/picklist/user_request.tt2 b/Open-ILS/src/templates/acq/picklist/user_request.tt2
index fe9486f926..a478fdc895 100644
--- a/Open-ILS/src/templates/acq/picklist/user_request.tt2
+++ b/Open-ILS/src/templates/acq/picklist/user_request.tt2
@@ -44,7 +44,7 @@
suppressFields='["id", "usr", "pickup_lib", "holdable_formats", "phone_notify", "email_notify", "lineitem", "eg_bib", "max_fee", "cancel_reason"]'
fieldOrder='["title", "author", "isxn", "article_title", "article_pages", "request_type", "volume", "pubdate", "publisher", "location", "other_info", "mentioned"]'
editOnEnter='true'
- suppressEditFields='["id", "holdable_formats", "phone_notify", "email_notify", "lineitem", "eg_bib", "max_fee", "cancel_reason"]'
+ suppressEditFields='["id", "holdable_formats", "phone_notify", "email_notify", "eg_bib", "max_fee", "cancel_reason"]'
fmClass='aur'
editStyle='pane'
autoHeight='true'
diff --git a/Open-ILS/web/js/ui/default/acq/common/li_table.js b/Open-ILS/web/js/ui/default/acq/common/li_table.js
index 3bfc4b46c6..23ed4283f4 100644
--- a/Open-ILS/web/js/ui/default/acq/common/li_table.js
+++ b/Open-ILS/web/js/ui/default/acq/common/li_table.js
@@ -297,6 +297,9 @@ function AcqLiTable() {
nodeByName("worksheet_link", row).href =
oilsBasePath + "/acq/lineitem/worksheet/" + li.id();
+ nodeByName("show_requests_link", row).href =
+ oilsBasePath + "/acq/picklist/user_request?lineitem=" + li.id();
+
dojo.query('[attr=title]', row)[0].onclick = function() {self.drawInfo(li.id())};
dojo.query('[name=copieslink]', row)[0].onclick = function() {self.drawCopies(li.id())};
dojo.query('[name=noteslink]', row)[0].onclick = function() {self.drawLiNotes(li)};
diff --git a/Open-ILS/web/js/ui/default/acq/picklist/user_request.js b/Open-ILS/web/js/ui/default/acq/picklist/user_request.js
index 331e0d9d8a..8e7f7c1924 100644
--- a/Open-ILS/web/js/ui/default/acq/picklist/user_request.js
+++ b/Open-ILS/web/js/ui/default/acq/picklist/user_request.js
@@ -21,13 +21,8 @@ var cgi = new openils.CGI();
function setup() {
- if (cgi.param('eg_bib')) {
- changeBib(cgi.param('eg_bib'));
- }
-
- if (cgi.param('lineitem')) {
- changeLI(cgi.param('lineitem'));
- }
+ changeBib(cgi.param('eg_bib'));
+ changeLI(cgi.param('lineitem'));
if (cgi.param('usr')) {
var usr_obj = fieldmapper.standardRequest(
--
2.11.0