From a7a2c7037c1bc3c22b309b57963a4abe7c6d2ee0 Mon Sep 17 00:00:00 2001
From: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Date: Mon, 19 Mar 2012 14:39:09 -0400
Subject: [PATCH] Alt serials opac reloading cleanup
Removed a call to xulG.reload_opac() that was no longer wanted
More debuggable. I think it might still be possbile to get to alt
serial control interfaces in contexts where they don't have
xulG.reload_opac(), but I can't think of any way to do it just now.
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
---
Open-ILS/src/templates/serial/list_item.tt2 | 3 ++-
Open-ILS/src/templates/serial/list_stream.tt2 | 3 ++-
Open-ILS/src/templates/serial/list_subscription.tt2 | 8 +++++---
Open-ILS/src/templates/serial/subscription.tt2 | 2 ++
Open-ILS/src/templates/serial/subscription/distribution.tt2 | 2 +-
Open-ILS/src/templates/serial/subscription/issuance.tt2 | 2 +-
Open-ILS/web/js/dojo/openils/widget/EditPane.js | 8 --------
Open-ILS/web/js/ui/default/serial/common.js | 7 +++++++
8 files changed, 20 insertions(+), 15 deletions(-)
create mode 100644 Open-ILS/web/js/ui/default/serial/common.js
diff --git a/Open-ILS/src/templates/serial/list_item.tt2 b/Open-ILS/src/templates/serial/list_item.tt2
index 950b9d5243..30dd390a9c 100644
--- a/Open-ILS/src/templates/serial/list_item.tt2
+++ b/Open-ILS/src/templates/serial/list_item.tt2
@@ -47,7 +47,7 @@
showSequenceFields="true"
fmClass="sitem"
editPaneOnSubmit="update_sitem_safely"
- onPostSubmit="function(){window.xulG && xulG.reload_opac()}"
+ onPostSubmit="attempt_reload_opac"
showPaginator="true"
editOnEnter="true">
<thead>
@@ -120,5 +120,6 @@
</div>
</div>
</div>
+<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/serial/common.js"></script>
<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/serial/list_item.js"></script>
[% END %]
diff --git a/Open-ILS/src/templates/serial/list_stream.tt2 b/Open-ILS/src/templates/serial/list_stream.tt2
index 0b8c2f7207..71ffa27f80 100644
--- a/Open-ILS/src/templates/serial/list_stream.tt2
+++ b/Open-ILS/src/templates/serial/list_stream.tt2
@@ -37,7 +37,7 @@
fieldOrder="['id','distribution','routing_label']"
suppressFields="['distribution']"
showSequenceFields="true"
- onPostSubmit="function(){window.xulG && xulG.reload_opac()}"
+ onPostSubmit="attempt_reload_opac"
fmClass="sstr"
showPaginator="true"
editOnEnter="true">
@@ -146,5 +146,6 @@
</div>
<div dojoType="openils.widget.ProgressDialog" jsId="progress_dialog"></div>
</div>
+<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/serial/common.js"> </script>
<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/serial/list_stream.js"> </script>
[% END %]
diff --git a/Open-ILS/src/templates/serial/list_subscription.tt2 b/Open-ILS/src/templates/serial/list_subscription.tt2
index dc23bc9eaa..719bee0ca3 100644
--- a/Open-ILS/src/templates/serial/list_subscription.tt2
+++ b/Open-ILS/src/templates/serial/list_subscription.tt2
@@ -1,7 +1,9 @@
[% WRAPPER base.tt2 %]
[% ctx.page_title = "Subscriptions" %]
-<script
- type="text/javascript"
+<script type="text/javascript"
+ src="[% ctx.media_prefix %]/js/ui/default/serial/common.js">
+</script>
+<script type="text/javascript"
src="[% ctx.media_prefix %]/js/ui/default/serial/list_subscription.js">
</script>
<script type="text/javascript">
@@ -39,7 +41,7 @@
suppressFields="['record_entry']"
fmClass="ssub"
showPaginator="true"
- onPostSubmit="function(){window.xulG && xulG.reload_opac()}"
+ onPostSubmit="attempt_reload_opac"
showSequenceFields="true"
editOnEnter="true">
<thead>
diff --git a/Open-ILS/src/templates/serial/subscription.tt2 b/Open-ILS/src/templates/serial/subscription.tt2
index c835d39908..47eb714f9e 100644
--- a/Open-ILS/src/templates/serial/subscription.tt2
+++ b/Open-ILS/src/templates/serial/subscription.tt2
@@ -3,6 +3,8 @@
var cap_editor;
var cap_importer;
</script>
+<script src="[% ctx.media_prefix %]/js/ui/default/serial/common.js">
+</script>
<script src="[% ctx.media_prefix %]/js/ui/default/serial/subscription.js">
</script>
<script src="[% ctx.media_prefix %]/js/ui/default/serial/subscription/caption_and_pattern.js">
diff --git a/Open-ILS/src/templates/serial/subscription/distribution.tt2 b/Open-ILS/src/templates/serial/subscription/distribution.tt2
index 3258c3a340..8a344bb2c7 100644
--- a/Open-ILS/src/templates/serial/subscription/distribution.tt2
+++ b/Open-ILS/src/templates/serial/subscription/distribution.tt2
@@ -23,7 +23,7 @@
suppressFields="['record_entry','subscription','receive_call_number','bind_call_number','bind_unit_template']"
suppressEditFields="['record_entry','receive_call_number','bind_call_number','bind_unit_template']"
requiredFields="['receive_unit_template']"
- onPostSubmit="function(){window.xulG && xulG.reload_opac()}"
+ onPostSubmit="attempt_reload_opac"
fmClass="sdist"
query="{id: '*'}"
editOnEnter="true"
diff --git a/Open-ILS/src/templates/serial/subscription/issuance.tt2 b/Open-ILS/src/templates/serial/subscription/issuance.tt2
index 21777ffae0..57a291ec2e 100644
--- a/Open-ILS/src/templates/serial/subscription/issuance.tt2
+++ b/Open-ILS/src/templates/serial/subscription/issuance.tt2
@@ -22,7 +22,7 @@
suppressFields="['subscription','holding_link_id','create_date','edit_date','creator','editor']"
suppressEditFields="['id','holding_link_id','create_date','edit_date']"
defaultCellWidth="'auto'"
- onPostSubmit="function(){window.xulG && xulG.reload_opac()}"
+ onPostSubmit="attempt_reload_opac"
fmClass="siss"
query="{id: '*'}"
editOnEnter="true"
diff --git a/Open-ILS/web/js/dojo/openils/widget/EditPane.js b/Open-ILS/web/js/dojo/openils/widget/EditPane.js
index 7587251fba..1fd41adb75 100644
--- a/Open-ILS/web/js/dojo/openils/widget/EditPane.js
+++ b/Open-ILS/web/js/dojo/openils/widget/EditPane.js
@@ -253,14 +253,6 @@ if(!dojo._hasResource['openils.widget.EditPane']) {
} else {
(new openils.PermaCrud())[this.mode](this.fmObject, opts);
}
-
- /* If we happen to have been spawned by something that
- * puts an reload_opac() function into our context, call it. */
- try {
- xulG.reload_opac();
- } catch(E) {
- (dump ? dump : console.log)(E);
- }
}
}
);
diff --git a/Open-ILS/web/js/ui/default/serial/common.js b/Open-ILS/web/js/ui/default/serial/common.js
new file mode 100644
index 0000000000..22c1abe9e9
--- /dev/null
+++ b/Open-ILS/web/js/ui/default/serial/common.js
@@ -0,0 +1,7 @@
+function attempt_reload_opac() {
+ try {
+ xulG.reload_opac();
+ } catch (E) {
+ (dump || console.log)(E);
+ }
+}
--
2.11.0