[open-ils-commits] r13416 - in trunk/Open-ILS: src/perlmods/OpenILS src/perlmods/OpenILS/Application/Cat src/support-scripts web/js/dojo/openils/widget web/templates (erickson)
svn at svn.open-ils.org
svn at svn.open-ils.org
Fri Jun 19 16:03:16 EDT 2009
Author: erickson
Date: 2009-06-19 16:03:12 -0400 (Fri, 19 Jun 2009)
New Revision: 13416
Removed:
trunk/Open-ILS/src/support-scripts/clear_expired_circ_history.srfsh
Modified:
trunk/Open-ILS/src/perlmods/OpenILS/Application/Cat/AuthCommon.pm
trunk/Open-ILS/src/perlmods/OpenILS/Event.pm
trunk/Open-ILS/web/js/dojo/openils/widget/AutoGrid.js
trunk/Open-ILS/web/templates/base.tt2
Log:
rolling back 13415, accidentally commited all local changes
Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Cat/AuthCommon.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Cat/AuthCommon.pm 2009-06-19 20:01:08 UTC (rev 13415)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Cat/AuthCommon.pm 2009-06-19 20:03:12 UTC (rev 13416)
@@ -36,10 +36,6 @@
$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 @@
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;
Modified: trunk/Open-ILS/src/perlmods/OpenILS/Event.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Event.pm 2009-06-19 20:01:08 UTC (rev 13415)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Event.pm 2009-06-19 20:03:12 UTC (rev 13416)
@@ -23,7 +23,7 @@
_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);
Deleted: trunk/Open-ILS/src/support-scripts/clear_expired_circ_history.srfsh
===================================================================
--- trunk/Open-ILS/src/support-scripts/clear_expired_circ_history.srfsh 2009-06-19 20:01:08 UTC (rev 13415)
+++ trunk/Open-ILS/src/support-scripts/clear_expired_circ_history.srfsh 2009-06-19 20:03:12 UTC (rev 13416)
@@ -1,2 +0,0 @@
-#!BINDIR/srfsh
-request open-ils.cstore open-ils.cstore.json_query {"from":["container.clear_all_expired_circ_history_items"]}
Modified: trunk/Open-ILS/web/js/dojo/openils/widget/AutoGrid.js
===================================================================
--- trunk/Open-ILS/web/js/dojo/openils/widget/AutoGrid.js 2009-06-19 20:01:08 UTC (rev 13415)
+++ trunk/Open-ILS/web/js/dojo/openils/widget/AutoGrid.js 2009-06-19 20:03:12 UTC (rev 13416)
@@ -447,7 +447,7 @@
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 @@
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();
+ }
}
Modified: trunk/Open-ILS/web/templates/base.tt2
===================================================================
--- trunk/Open-ILS/web/templates/base.tt2 2009-06-19 20:01:08 UTC (rev 13415)
+++ trunk/Open-ILS/web/templates/base.tt2 2009-06-19 20:03:12 UTC (rev 13416)
@@ -10,7 +10,7 @@
<link rel='stylesheet' type='text/css'
href='[% ctx.media_prefix %]/css/theme/[% ctx.skin %].css'></link>
<script type="text/javascript" src="[% ctx.media_prefix %]/js/dojo/dojo/dojo.js"
- djConfig="parseOnLoad: true, isDebug:true"></script>
+ djConfig="parseOnLoad: true, isDebug:false"></script>
<script type="text/javascript" src="[% ctx.media_prefix %]/js/dojo/dojo/openils_dojo.js"
djConfig="parseOnLoad: true, isDebug:false"></script>
<script type="text/javascript" src="[% ctx.media_prefix %]/js/dojo/opensrf/md5.js"></script>
More information about the open-ils-commits
mailing list