From d9f0f1c598200e873fdf612ee3d20659315c6659 Mon Sep 17 00:00:00 2001 From: erickson Date: Fri, 19 Jun 2009 20:03:12 +0000 Subject: [PATCH] rolling back 13415, accidentally commited all local changes git-svn-id: svn://svn.open-ils.org/ILS/trunk@13416 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../OpenILS/Application/Cat/AuthCommon.pm | 24 -------------- Open-ILS/src/perlmods/OpenILS/Event.pm | 2 +- .../clear_expired_circ_history.srfsh | 2 -- .../web/js/dojo/openils/widget/AutoGrid.js | 31 +++---------------- Open-ILS/web/templates/base.tt2 | 2 +- 5 files changed, 7 insertions(+), 54 deletions(-) delete mode 100755 Open-ILS/src/support-scripts/clear_expired_circ_history.srfsh diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Cat/AuthCommon.pm b/Open-ILS/src/perlmods/OpenILS/Application/Cat/AuthCommon.pm index 1c55b8642b..a8ef1f0bcb 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Cat/AuthCommon.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Cat/AuthCommon.pm @@ -36,10 +36,6 @@ sub import_authority_record { $rec->edit_date('now'); $rec->marc($U->entityize($marc_doc->documentElement->toString)); - my ($arn, $evt) = find_arn($e, $marc_doc); - return $evt if $evt; - $rec->arn_value($arn); - $rec = $e->create_authority_record_entry($rec) or return $e->die_event; # we don't care about the result, just fire off the request @@ -68,24 +64,4 @@ sub overlay_authority_record { return $rec; } -sub find_arn { - my($e, $marc_doc) = @_; - - my $xpath = '//marc:controlfield[@tag="001"]'; - my ($arn) = $marc_doc->documentElement->findvalue($xpath); - - if(my $existing_rec = $e->search_authority_record_entry({arn_value => $arn, deleted => 'f'})->[0]) { - # this arn is taken - return ( - undef, - OpenILS::Event->new( - 'AUTHORITY_RECORD_NUMBER_EXISTS', - payload => {existing_record => $existing_rec, arn => $arn} - ) - ); - } - - return ($arn); -} - 1; diff --git a/Open-ILS/src/perlmods/OpenILS/Event.pm b/Open-ILS/src/perlmods/OpenILS/Event.pm index 28c9c3a38d..b33cd80de6 100644 --- a/Open-ILS/src/perlmods/OpenILS/Event.pm +++ b/Open-ILS/src/perlmods/OpenILS/Event.pm @@ -23,7 +23,7 @@ sub new { _load_events() unless $events; throw OpenSRF::EX ("Bad event name: $event") unless $event; - my $e = $events->{$event} || -1; + my $e = $events->{$event}; my( $m, $f, $l ) = caller(0); my( $mm, $ff, $ll ) = caller(1); diff --git a/Open-ILS/src/support-scripts/clear_expired_circ_history.srfsh b/Open-ILS/src/support-scripts/clear_expired_circ_history.srfsh deleted file mode 100755 index 16628ec1f5..0000000000 --- a/Open-ILS/src/support-scripts/clear_expired_circ_history.srfsh +++ /dev/null @@ -1,2 +0,0 @@ -#!BINDIR/srfsh -request open-ils.cstore open-ils.cstore.json_query {"from":["container.clear_all_expired_circ_history_items"]} diff --git a/Open-ILS/web/js/dojo/openils/widget/AutoGrid.js b/Open-ILS/web/js/dojo/openils/widget/AutoGrid.js index d20f166e35..6fb19edbe1 100644 --- a/Open-ILS/web/js/dojo/openils/widget/AutoGrid.js +++ b/Open-ILS/web/js/dojo/openils/widget/AutoGrid.js @@ -447,7 +447,7 @@ if(!dojo._hasResource['openils.widget.AutoGrid']) { onresponse : function(r) { var item = openils.Util.readResponse(r); self.store.newItem(item.toStoreItem()); - }, + } }); if(search) new openils.PermaCrud().search(this.fmClass, search, opts); @@ -471,31 +471,10 @@ if(!dojo._hasResource['openils.widget.AutoGrid']) { fmField: this.field, widgetValue : val, readOnly : true, + forceSync : true }); - - var syncTest = 0; - var self = this; - - autoWidget.build( - function(w, ww) { - if(syncTest == 1) { //async - var node = self.grid.views.views[0].getCellNode(rowIndex, self.index); - if(node && !node.__autogrid_value_set) { - node.innerHTML = ww.getDisplayString(); - node.__autogrid_value_set = true; - } - } - syncTest = 2; - } - ); - - var val = ''; - - if(syncTest == 2) // sync - val = autoWidget.getDisplayString(); // sync - - syncTest = 1; - return val; - }; + //autoWidget.build(); + return autoWidget.getDisplayString(); + } } diff --git a/Open-ILS/web/templates/base.tt2 b/Open-ILS/web/templates/base.tt2 index df9502ccac..5fdf662e8a 100644 --- a/Open-ILS/web/templates/base.tt2 +++ b/Open-ILS/web/templates/base.tt2 @@ -10,7 +10,7 @@ + djConfig="parseOnLoad: true, isDebug:false"> -- 2.43.2