[open-ils-commits] r18634 - in trunk/Open-ILS: src/sql/Pg src/sql/Pg/upgrade web/js/dojo/openils/acq web/js/ui/default/acq/common web/js/ui/default/acq/invoice web/js/ui/default/acq/lineitem web/js/ui/default/acq/picklist web/js/ui/default/acq/search xul/staff_client/server/circ (gmc)
svn at svn.open-ils.org
svn at svn.open-ils.org
Fri Nov 5 13:52:33 EDT 2010
Author: gmc
Date: 2010-11-05 13:52:28 -0400 (Fri, 05 Nov 2010)
New Revision: 18634
Removed:
trunk/Open-ILS/src/sql/Pg/upgrade/0459.schema.password-reset-request-time.sql
Modified:
trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql
trunk/Open-ILS/web/js/dojo/openils/acq/Lineitem.js
trunk/Open-ILS/web/js/dojo/openils/acq/Picklist.js
trunk/Open-ILS/web/js/ui/default/acq/common/li_table.js
trunk/Open-ILS/web/js/ui/default/acq/invoice/view.js
trunk/Open-ILS/web/js/ui/default/acq/lineitem/related.js
trunk/Open-ILS/web/js/ui/default/acq/picklist/brief_record.js
trunk/Open-ILS/web/js/ui/default/acq/picklist/user_request.js
trunk/Open-ILS/web/js/ui/default/acq/picklist/view.js
trunk/Open-ILS/web/js/ui/default/acq/picklist/view_list.js
trunk/Open-ILS/web/js/ui/default/acq/search/picklist.js
trunk/Open-ILS/xul/staff_client/server/circ/util.js
Log:
undo premature commit
Modified: trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql 2010-11-05 17:50:28 UTC (rev 18633)
+++ trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql 2010-11-05 17:52:28 UTC (rev 18634)
@@ -4963,15 +4963,9 @@
# BT - vendcode goes to NAD/BY *suffix* w/ 91 qualifier
# INGRAM - vendcode goes to NAD/BY *segment* w/ 91 qualifier (separately)
# BRODART - vendcode goes to FTX segment (lineitem level)
- # In the logic below, vendors are identified by their SANs, as that
- # is the identifier most likely to be the same from library to library.
- # Baker & Taylor = 1556150
- # Brodart = 1697684
- # Ingram = 1697978
- # Midwest Tapes = 2549913
-%]
[%-
-IF target.provider.edi_default.vendcode && target.provider.san == '1697684';
+IF target.provider.edi_default.vendcode && target.provider.code == 'BRODART';
xtra_ftx = target.provider.edi_default.vendcode;
END;
-%]
@@ -4984,9 +4978,9 @@
"po_number":[% target.id %],
"date":"[% date.format(date.now, '%Y%m%d') %]",
"buyer":[
- [% IF target.provider.edi_default.vendcode && (target.provider.san == '1556150') -%]
+ [% IF target.provider.edi_default.vendcode && (target.provider.code == 'BT' || target.provider.name.match('(?i)^BAKER & TAYLOR')) -%]
{"id-qualifier": 91, "id":"[% target.ordering_agency.mailing_address.san _ ' ' _ target.provider.edi_default.vendcode %]"}
- [%- ELSIF target.provider.edi_default.vendcode && target.provider.san == '1697978' -%]
+ [%- ELSIF target.provider.edi_default.vendcode && target.provider.code == 'INGRAM' -%]
{"id":"[% target.ordering_agency.mailing_address.san %]"},
{"id-qualifier": 91, "id":"[% target.provider.edi_default.vendcode %]"}
[%- ELSE -%]
@@ -5012,9 +5006,6 @@
{"id-qualifier":"IB","id":"[% isbn %]"},
[%- END %]
[% END %]
- [% IF helpers.get_li_attr('upc', '', li.attributes) %]
- {"id-qualifier":"UP","id":"[% helpers.get_li_attr('upc', '', li.attributes) %]"}
- [% END %]
{"id-qualifier":"IN","id":"[% li.id %]"}
],
"price":[% li.estimated_unit_price || '0.00' %],
Deleted: trunk/Open-ILS/src/sql/Pg/upgrade/0459.schema.password-reset-request-time.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/upgrade/0459.schema.password-reset-request-time.sql 2010-11-05 17:50:28 UTC (rev 18633)
+++ trunk/Open-ILS/src/sql/Pg/upgrade/0459.schema.password-reset-request-time.sql 2010-11-05 17:52:28 UTC (rev 18634)
@@ -1,7 +0,0 @@
-BEGIN;
-
-INSERT INTO config.upgrade_log (version) VALUES ('0459'); -- gmc
-
-ALTER TABLE actor.usr_password_reset ALTER COLUMN request_time TYPE TIMESTAMP WITH TIME ZONE;
-
-COMMIT;
Modified: trunk/Open-ILS/web/js/dojo/openils/acq/Lineitem.js
===================================================================
--- trunk/Open-ILS/web/js/dojo/openils/acq/Lineitem.js 2010-11-05 17:50:28 UTC (rev 18633)
+++ trunk/Open-ILS/web/js/dojo/openils/acq/Lineitem.js 2010-11-05 17:52:28 UTC (rev 18634)
@@ -119,7 +119,7 @@
});
fieldmapper.standardRequest(
- ['open-ils.acq', 'open-ils.acq.lineitem.retrieve.authoritative'],
+ ['open-ils.acq', 'open-ils.acq.lineitem.retrieve'],
{
params : [ openils.User.authtoken, liId, args ],
Modified: trunk/Open-ILS/web/js/dojo/openils/acq/Picklist.js
===================================================================
--- trunk/Open-ILS/web/js/dojo/openils/acq/Picklist.js 2010-11-05 17:50:28 UTC (rev 18633)
+++ trunk/Open-ILS/web/js/dojo/openils/acq/Picklist.js 2010-11-05 17:52:28 UTC (rev 18634)
@@ -57,7 +57,7 @@
//
// Fetch the picklist information
fieldmapper.standardRequest(
- ['open-ils.acq', 'open-ils.acq.picklist.retrieve.authoritative'],
+ ['open-ils.acq', 'open-ils.acq.picklist.retrieve'],
{ async: false,
params: [openils.User.authtoken, pl_id, {flesh_lineitem_count:1}],
oncomplete: function(r) {
Modified: trunk/Open-ILS/web/js/ui/default/acq/common/li_table.js
===================================================================
--- trunk/Open-ILS/web/js/ui/default/acq/common/li_table.js 2010-11-05 17:50:28 UTC (rev 18633)
+++ trunk/Open-ILS/web/js/ui/default/acq/common/li_table.js 2010-11-05 17:52:28 UTC (rev 18634)
@@ -323,7 +323,7 @@
this.plCache[li.picklist()] =
this.plCache[li.picklist()] ||
fieldmapper.standardRequest(
- ['open-ils.acq', 'open-ils.acq.picklist.retrieve.authoritative'],
+ ['open-ils.acq', 'open-ils.acq.picklist.retrieve'],
{params: [this.authtoken, li.picklist()]});
if (pl) {
if (pl.name() == "") {
Modified: trunk/Open-ILS/web/js/ui/default/acq/invoice/view.js
===================================================================
--- trunk/Open-ILS/web/js/ui/default/acq/invoice/view.js 2010-11-05 17:50:28 UTC (rev 18633)
+++ trunk/Open-ILS/web/js/ui/default/acq/invoice/view.js 2010-11-05 17:52:28 UTC (rev 18634)
@@ -52,7 +52,7 @@
} else {
fieldmapper.standardRequest(
- ['open-ils.acq', 'open-ils.acq.invoice.retrieve.authoritative'],
+ ['open-ils.acq', 'open-ils.acq.invoice.retrieve'],
{
params : [openils.User.authtoken, invoiceId],
oncomplete : function(r) {
Modified: trunk/Open-ILS/web/js/ui/default/acq/lineitem/related.js
===================================================================
--- trunk/Open-ILS/web/js/ui/default/acq/lineitem/related.js 2010-11-05 17:50:28 UTC (rev 18633)
+++ trunk/Open-ILS/web/js/ui/default/acq/lineitem/related.js 2010-11-05 17:52:28 UTC (rev 18634)
@@ -14,7 +14,7 @@
function fetchLi() {
fieldmapper.standardRequest(
- ["open-ils.acq", "open-ils.acq.lineitem.retrieve.authoritative"], {
+ ["open-ils.acq", "open-ils.acq.lineitem.retrieve"], {
"async": true,
"params": [openils.User.authtoken, targetId, {
"flesh_attrs": true,
Modified: trunk/Open-ILS/web/js/ui/default/acq/picklist/brief_record.js
===================================================================
--- trunk/Open-ILS/web/js/ui/default/acq/picklist/brief_record.js 2010-11-05 17:50:28 UTC (rev 18633)
+++ trunk/Open-ILS/web/js/ui/default/acq/picklist/brief_record.js 2010-11-05 17:52:28 UTC (rev 18634)
@@ -30,7 +30,7 @@
openils.Util.hide('acq-brief-record-po-row');
fieldmapper.standardRequest(
- ['open-ils.acq', 'open-ils.acq.picklist.retrieve.authoritative'],
+ ['open-ils.acq', 'open-ils.acq.picklist.retrieve'],
{ async: true,
params: [openils.User.authtoken, paramPL],
oncomplete : function(r) {
Modified: trunk/Open-ILS/web/js/ui/default/acq/picklist/user_request.js
===================================================================
--- trunk/Open-ILS/web/js/ui/default/acq/picklist/user_request.js 2010-11-05 17:50:28 UTC (rev 18633)
+++ trunk/Open-ILS/web/js/ui/default/acq/picklist/user_request.js 2010-11-05 17:52:28 UTC (rev 18634)
@@ -90,7 +90,7 @@
function viewPicklist() {
var lineitem = fieldmapper.standardRequest(
- [ 'open-ils.acq', 'open-ils.acq.lineitem.retrieve.authoritative' ],
+ [ 'open-ils.acq', 'open-ils.acq.lineitem.retrieve' ],
{
params: [openils.User.authtoken, aur_obj.lineitem()]
}
Modified: trunk/Open-ILS/web/js/ui/default/acq/picklist/view.js
===================================================================
--- trunk/Open-ILS/web/js/ui/default/acq/picklist/view.js 2010-11-05 17:50:28 UTC (rev 18633)
+++ trunk/Open-ILS/web/js/ui/default/acq/picklist/view.js 2010-11-05 17:52:28 UTC (rev 18634)
@@ -14,7 +14,7 @@
liTable = new AcqLiTable();
liTable.isPL = plId;
fieldmapper.standardRequest(
- ['open-ils.acq', 'open-ils.acq.picklist.retrieve.authoritative'],
+ ['open-ils.acq', 'open-ils.acq.picklist.retrieve'],
{ async: true,
params: [openils.User.authtoken, plId,
{flesh_lineitem_count:true, flesh_owner:true}],
Modified: trunk/Open-ILS/web/js/ui/default/acq/picklist/view_list.js
===================================================================
--- trunk/Open-ILS/web/js/ui/default/acq/picklist/view_list.js 2010-11-05 17:50:28 UTC (rev 18633)
+++ trunk/Open-ILS/web/js/ui/default/acq/picklist/view_list.js 2010-11-05 17:52:28 UTC (rev 18634)
@@ -68,7 +68,7 @@
function(plId) {
fieldmapper.standardRequest(
- ['open-ils.acq', 'open-ils.acq.picklist.retrieve.authoritative'],
+ ['open-ils.acq', 'open-ils.acq.picklist.retrieve'],
{ async: true,
params: [openils.User.authtoken, plId,
{flesh_lineitem_count:1, flesh_owner:1}],
Modified: trunk/Open-ILS/web/js/ui/default/acq/search/picklist.js
===================================================================
--- trunk/Open-ILS/web/js/ui/default/acq/search/picklist.js 2010-11-05 17:50:28 UTC (rev 18633)
+++ trunk/Open-ILS/web/js/ui/default/acq/search/picklist.js 2010-11-05 17:52:28 UTC (rev 18634)
@@ -165,7 +165,7 @@
openils.acq.Picklist.create(fields,
function(plId) {
fieldmapper.standardRequest(
- ["open-ils.acq", "open-ils.acq.picklist.retrieve.authoritative"], {
+ ["open-ils.acq", "open-ils.acq.picklist.retrieve"], {
"async": true,
"params": [
openils.User.authtoken, plId,
Modified: trunk/Open-ILS/xul/staff_client/server/circ/util.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/circ/util.js 2010-11-05 17:50:28 UTC (rev 18633)
+++ trunk/Open-ILS/xul/staff_client/server/circ/util.js 2010-11-05 17:52:28 UTC (rev 18634)
@@ -3402,7 +3402,7 @@
circ.util.find_acq_po = function(session, copy_id) {
dojo.require("openils.Util");
fieldmapper.standardRequest(
- ["open-ils.acq", "open-ils.acq.lineitem.retrieve.by_copy_id.authoritative"], {
+ ["open-ils.acq", "open-ils.acq.lineitem.retrieve.by_copy_id"], {
"params": [session, copy_id, {"clear_marc": true}],
"onresponse": function(r) {
if (r = openils.Util.readResponse(r)) {
More information about the open-ils-commits
mailing list