projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
990d718
)
prevent reload loops on process pages, #71249
author
Mark Wells
<mark@freeside.biz>
Tue, 26 Jul 2016 22:06:36 +0000
(15:06 -0700)
committer
Mark Wells
<mark@freeside.biz>
Thu, 28 Jul 2016 00:10:12 +0000
(17:10 -0700)
53 files changed:
httemplate/edit/process/bulk-cust_main_county.html
patch
|
blob
|
history
httemplate/edit/process/bulk-cust_svc-pkgnum.html
patch
|
blob
|
history
httemplate/edit/process/cgp_rule-simplified.html
patch
|
blob
|
history
httemplate/edit/process/change-cust_pkg.html
patch
|
blob
|
history
httemplate/edit/process/credit-cust_bill_pkg.html
patch
|
blob
|
history
httemplate/edit/process/cust_credit-pkgnum.html
patch
|
blob
|
history
httemplate/edit/process/cust_credit.cgi
patch
|
blob
|
history
httemplate/edit/process/cust_location-censustract.html
patch
|
blob
|
history
httemplate/edit/process/cust_location.cgi
patch
|
blob
|
history
httemplate/edit/process/cust_main_attach.cgi
patch
|
blob
|
history
httemplate/edit/process/cust_main_county-add.cgi
patch
|
blob
|
history
httemplate/edit/process/cust_main_county-expand.cgi
patch
|
blob
|
history
httemplate/edit/process/cust_main_note.cgi
patch
|
blob
|
history
httemplate/edit/process/cust_pay-no_auto_apply.cgi
patch
|
blob
|
history
httemplate/edit/process/cust_pay-pkgnum.html
patch
|
blob
|
history
httemplate/edit/process/cust_pay.cgi
patch
|
blob
|
history
httemplate/edit/process/cust_pay_pending.html
patch
|
blob
|
history
httemplate/edit/process/cust_pkg_detail.html
patch
|
blob
|
history
httemplate/edit/process/cust_pkg_discount.html
patch
|
blob
|
history
httemplate/edit/process/cust_pkg_quantity.html
patch
|
blob
|
history
httemplate/edit/process/cust_pkg_salesnum.html
patch
|
blob
|
history
httemplate/edit/process/cust_refund.cgi
patch
|
blob
|
history
httemplate/edit/process/cust_tax_adjustment.html
patch
|
blob
|
history
httemplate/edit/process/detach-cust_pkg.html
patch
|
blob
|
history
httemplate/edit/process/domain_record.cgi
patch
|
blob
|
history
httemplate/edit/process/elements/ApplicationCommon.html
patch
|
blob
|
history
httemplate/edit/process/elements/process.html
patch
|
blob
|
history
httemplate/edit/process/quick-charge.cgi
patch
|
blob
|
history
httemplate/edit/process/quotation_pkg_detail.html
patch
|
blob
|
history
httemplate/elements/header-full.html
patch
|
blob
|
history
httemplate/elements/header-popup.html
patch
|
blob
|
history
httemplate/elements/topreload.js
[new file with mode: 0644]
patch
|
blob
httemplate/misc/cust_main-cancel.cgi
patch
|
blob
|
history
httemplate/misc/cust_main-suspend.cgi
patch
|
blob
|
history
httemplate/misc/cust_main-unsuspend.cgi
patch
|
blob
|
history
httemplate/misc/delete-addr_range.html
patch
|
blob
|
history
httemplate/misc/delete-rate_detail.html
patch
|
blob
|
history
httemplate/misc/did_order_confirmed.html
patch
|
blob
|
history
httemplate/misc/disable-cust_location.cgi
patch
|
blob
|
history
httemplate/misc/disable-msg_template.cgi
patch
|
blob
|
history
httemplate/misc/process/bulk_pkg_increment_bill.cgi
patch
|
blob
|
history
httemplate/misc/process/cancel_pkg.html
patch
|
blob
|
history
httemplate/misc/process/change_pkg_contact.html
patch
|
blob
|
history
httemplate/misc/process/cust_bill-promised_date.html
patch
|
blob
|
history
httemplate/misc/process/delay_susp_pkg.html
patch
|
blob
|
history
httemplate/misc/process/enable_or_disable_tax.html
patch
|
blob
|
history
httemplate/misc/process/nms-add_iface.html
patch
|
blob
|
history
httemplate/misc/process/nms-add_router.html
patch
|
blob
|
history
httemplate/misc/process/recharge_svc.html
patch
|
blob
|
history
httemplate/misc/process/unhold_pkg.html
patch
|
blob
|
history
httemplate/misc/process/void-cust_bill.html
patch
|
blob
|
history
httemplate/misc/reason-merge.html
patch
|
blob
|
history
httemplate/misc/void-cust_credit.html
patch
|
blob
|
history
diff --git
a/httemplate/edit/process/bulk-cust_main_county.html
b/httemplate/edit/process/bulk-cust_main_county.html
index
b7ff40f
..
b5a0258
100644
(file)
--- a/
httemplate/edit/process/bulk-cust_main_county.html
+++ b/
httemplate/edit/process/bulk-cust_main_county.html
@@
-12,7
+12,7
@@
<% include('/elements/header-popup.html', "Taxes ${action}ed") %>
<SCRIPT TYPE="text/javascript">
<% include('/elements/header-popup.html', "Taxes ${action}ed") %>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY>
</SCRIPT>
</BODY>
diff --git
a/httemplate/edit/process/bulk-cust_svc-pkgnum.html
b/httemplate/edit/process/bulk-cust_svc-pkgnum.html
index
f5cf7dd
..
3c27306
100644
(file)
--- a/
httemplate/edit/process/bulk-cust_svc-pkgnum.html
+++ b/
httemplate/edit/process/bulk-cust_svc-pkgnum.html
@@
-7,7
+7,7
@@
<% header(emt("Services moved")) %>
<SCRIPT TYPE="text/javascript">
<% header(emt("Services moved")) %>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY>
</HTML>
</SCRIPT>
</BODY>
</HTML>
diff --git
a/httemplate/edit/process/cgp_rule-simplified.html
b/httemplate/edit/process/cgp_rule-simplified.html
index
60769d4
..
24515d5
100644
(file)
--- a/
httemplate/edit/process/cgp_rule-simplified.html
+++ b/
httemplate/edit/process/cgp_rule-simplified.html
@@
-4,7
+4,7
@@
% } else { #success XXX better msg talking about vacation vs. redirect all
<% include('/elements/header-popup.html', 'Rule updated') %>
<SCRIPT TYPE="text/javascript">
% } else { #success XXX better msg talking about vacation vs. redirect all
<% include('/elements/header-popup.html', 'Rule updated') %>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY>
</SCRIPT>
</BODY>
diff --git
a/httemplate/edit/process/change-cust_pkg.html
b/httemplate/edit/process/change-cust_pkg.html
index
308ea8f
..
54cafbf
100644
(file)
--- a/
httemplate/edit/process/change-cust_pkg.html
+++ b/
httemplate/edit/process/change-cust_pkg.html
@@
-5,7
+5,7
@@
<% header(emt("Package changed")) %>
<SCRIPT TYPE="text/javascript">
<% header(emt("Package changed")) %>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY>
</HTML>
</SCRIPT>
</BODY>
</HTML>
diff --git
a/httemplate/edit/process/credit-cust_bill_pkg.html
b/httemplate/edit/process/credit-cust_bill_pkg.html
index
75900bd
..
12b68c0
100644
(file)
--- a/
httemplate/edit/process/credit-cust_bill_pkg.html
+++ b/
httemplate/edit/process/credit-cust_bill_pkg.html
@@
-3,7
+3,7
@@
%} else {
<& /elements/header-popup.html, 'Credit successful' &>
<SCRIPT TYPE="text/javascript">
%} else {
<& /elements/header-popup.html, 'Credit successful' &>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY></HTML>
% }
</SCRIPT>
</BODY></HTML>
% }
diff --git
a/httemplate/edit/process/cust_credit-pkgnum.html
b/httemplate/edit/process/cust_credit-pkgnum.html
index
8941cbc
..
56f7989
100755
(executable)
--- a/
httemplate/edit/process/cust_credit-pkgnum.html
+++ b/
httemplate/edit/process/cust_credit-pkgnum.html
@@
-4,7
+4,7
@@
%} else {
<% header(emt('Credit package changed')) %>
<SCRIPT TYPE="text/javascript">
%} else {
<% header(emt('Credit package changed')) %>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY></HTML>
</SCRIPT>
</BODY></HTML>
diff --git
a/httemplate/edit/process/cust_credit.cgi
b/httemplate/edit/process/cust_credit.cgi
index
39c6f19
..
5d30287
100755
(executable)
--- a/
httemplate/edit/process/cust_credit.cgi
+++ b/
httemplate/edit/process/cust_credit.cgi
@@
-16,7
+16,7
@@
%
<% header(emt('Credit successful')) %>
<SCRIPT TYPE="text/javascript">
%
<% header(emt('Credit successful')) %>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY></HTML>
</SCRIPT>
</BODY></HTML>
diff --git
a/httemplate/edit/process/cust_location-censustract.html
b/httemplate/edit/process/cust_location-censustract.html
index
bc9cd4f
..
6edaca3
100644
(file)
--- a/
httemplate/edit/process/cust_location-censustract.html
+++ b/
httemplate/edit/process/cust_location-censustract.html
@@
-5,7
+5,7
@@
<% header("Census tract changed") %>
<SCRIPT TYPE="text/javascript">
<% header("Census tract changed") %>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY>
</HTML>
</SCRIPT>
</BODY>
</HTML>
diff --git
a/httemplate/edit/process/cust_location.cgi
b/httemplate/edit/process/cust_location.cgi
index
fd1b874
..
3a23881
100644
(file)
--- a/
httemplate/edit/process/cust_location.cgi
+++ b/
httemplate/edit/process/cust_location.cgi
@@
-5,7
+5,7
@@
<% header("Location changed") %>
<SCRIPT TYPE="text/javascript">
<% header("Location changed") %>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY>
</HTML>
</SCRIPT>
</BODY>
</HTML>
diff --git
a/httemplate/edit/process/cust_main_attach.cgi
b/httemplate/edit/process/cust_main_attach.cgi
index
09c18ad
..
5695002
100644
(file)
--- a/
httemplate/edit/process/cust_main_attach.cgi
+++ b/
httemplate/edit/process/cust_main_attach.cgi
@@
-9,7
+9,7
@@
% $act = 'deleted' if($attachnum and $delete);
<% header('Attachment ' . $act ) %>
<SCRIPT TYPE="text/javascript">
% $act = 'deleted' if($attachnum and $delete);
<% header('Attachment ' . $act ) %>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY></HTML>
% }
</SCRIPT>
</BODY></HTML>
% }
diff --git
a/httemplate/edit/process/cust_main_county-add.cgi
b/httemplate/edit/process/cust_main_county-add.cgi
index
fc8956b
..
fcc138f
100755
(executable)
--- a/
httemplate/edit/process/cust_main_county-add.cgi
+++ b/
httemplate/edit/process/cust_main_county-add.cgi
@@
-1,7
+1,7
@@
<% include('/elements/header-popup.html', 'Addition successful' ) %>
<SCRIPT TYPE="text/javascript">
<% include('/elements/header-popup.html', 'Addition successful' ) %>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY>
</SCRIPT>
</BODY>
diff --git
a/httemplate/edit/process/cust_main_county-expand.cgi
b/httemplate/edit/process/cust_main_county-expand.cgi
index
a108276
..
42e4673
100755
(executable)
--- a/
httemplate/edit/process/cust_main_county-expand.cgi
+++ b/
httemplate/edit/process/cust_main_county-expand.cgi
@@
-1,7
+1,7
@@
<% include('/elements/header-popup.html', 'Addition successful' ) %>
<SCRIPT TYPE="text/javascript">
<% include('/elements/header-popup.html', 'Addition successful' ) %>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY>
</SCRIPT>
</BODY>
diff --git
a/httemplate/edit/process/cust_main_note.cgi
b/httemplate/edit/process/cust_main_note.cgi
index
53e616a
..
bb52db8
100755
(executable)
--- a/
httemplate/edit/process/cust_main_note.cgi
+++ b/
httemplate/edit/process/cust_main_note.cgi
@@
-4,7
+4,7
@@
%} else {
<% header('Note ' . ($notenum ? 'updated' : 'added') ) %>
<SCRIPT TYPE="text/javascript">
%} else {
<% header('Note ' . ($notenum ? 'updated' : 'added') ) %>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY></HTML>
% }
</SCRIPT>
</BODY></HTML>
% }
diff --git
a/httemplate/edit/process/cust_pay-no_auto_apply.cgi
b/httemplate/edit/process/cust_pay-no_auto_apply.cgi
index
ccbd2d7
..
4a5ee84
100644
(file)
--- a/
httemplate/edit/process/cust_pay-no_auto_apply.cgi
+++ b/
httemplate/edit/process/cust_pay-no_auto_apply.cgi
@@
-15,7
+15,7
@@
Requires 'Apply payment' acl.
<P STYLE="font-weight: bold;"><% emt($message) %></P>
<P><% emt('Please wait while the page reloads.') %></P>
<SCRIPT TYPE="text/javascript">
<P STYLE="font-weight: bold;"><% emt($message) %></P>
<P><% emt('Please wait while the page reloads.') %></P>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
% }
</SCRIPT>
% }
diff --git
a/httemplate/edit/process/cust_pay-pkgnum.html
b/httemplate/edit/process/cust_pay-pkgnum.html
index
d9a92a1
..
cefe970
100755
(executable)
--- a/
httemplate/edit/process/cust_pay-pkgnum.html
+++ b/
httemplate/edit/process/cust_pay-pkgnum.html
@@
-4,7
+4,7
@@
%} else {
<% header(emt('Payment package changed')) %>
<SCRIPT TYPE="text/javascript">
%} else {
<% header(emt('Payment package changed')) %>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY></HTML>
</SCRIPT>
</BODY></HTML>
diff --git
a/httemplate/edit/process/cust_pay.cgi
b/httemplate/edit/process/cust_pay.cgi
index
56d3f2f
..
d85267c
100755
(executable)
--- a/
httemplate/edit/process/cust_pay.cgi
+++ b/
httemplate/edit/process/cust_pay.cgi
@@
-14,7
+14,7
@@
%
<% header(emt('Payment entered')) %>
<SCRIPT TYPE="text/javascript">
%
<% header(emt('Payment entered')) %>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY></HTML>
</SCRIPT>
</BODY></HTML>
diff --git
a/httemplate/edit/process/cust_pay_pending.html
b/httemplate/edit/process/cust_pay_pending.html
index
0ff7d26
..
80bd14a
100644
(file)
--- a/
httemplate/edit/process/cust_pay_pending.html
+++ b/
httemplate/edit/process/cust_pay_pending.html
@@
-3,7
+3,7
@@
<FONT SIZE="+1" COLOR="#ff0000">Error: <% $error |h %></FONT>
% } else {
<SCRIPT TYPE="text/javascript">
<FONT SIZE="+1" COLOR="#ff0000">Error: <% $error |h %></FONT>
% } else {
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
% }
</BODY>
</SCRIPT>
% }
</BODY>
diff --git
a/httemplate/edit/process/cust_pkg_detail.html
b/httemplate/edit/process/cust_pkg_detail.html
index
132ff63
..
25fabd9
100644
(file)
--- a/
httemplate/edit/process/cust_pkg_detail.html
+++ b/
httemplate/edit/process/cust_pkg_detail.html
@@
-6,7
+6,7
@@
% } else {
<% header($action) %>
<SCRIPT TYPE="text/javascript">
% } else {
<% header($action) %>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY></HTML>
% }
</SCRIPT>
</BODY></HTML>
% }
diff --git
a/httemplate/edit/process/cust_pkg_discount.html
b/httemplate/edit/process/cust_pkg_discount.html
index
143611e
..
9635463
100644
(file)
--- a/
httemplate/edit/process/cust_pkg_discount.html
+++ b/
httemplate/edit/process/cust_pkg_discount.html
@@
-5,7
+5,7
@@
<% header("Discount applied") %>
<SCRIPT TYPE="text/javascript">
<% header("Discount applied") %>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY>
</HTML>
</SCRIPT>
</BODY>
</HTML>
diff --git
a/httemplate/edit/process/cust_pkg_quantity.html
b/httemplate/edit/process/cust_pkg_quantity.html
index
fb26572
..
b605955
100644
(file)
--- a/
httemplate/edit/process/cust_pkg_quantity.html
+++ b/
httemplate/edit/process/cust_pkg_quantity.html
@@
-5,7
+5,7
@@
<& /elements/header-popup.html, "Quantity changed" &>
<SCRIPT TYPE="text/javascript">
<& /elements/header-popup.html, "Quantity changed" &>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY>
</HTML>
</SCRIPT>
</BODY>
</HTML>
diff --git
a/httemplate/edit/process/cust_pkg_salesnum.html
b/httemplate/edit/process/cust_pkg_salesnum.html
index
aab3741
..
c1cb268
100644
(file)
--- a/
httemplate/edit/process/cust_pkg_salesnum.html
+++ b/
httemplate/edit/process/cust_pkg_salesnum.html
@@
-5,7
+5,7
@@
<& /elements/header-popup.html, "Sales Person changed" &>
<SCRIPT TYPE="text/javascript">
<& /elements/header-popup.html, "Sales Person changed" &>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY>
</HTML>
</SCRIPT>
</BODY>
</HTML>
diff --git
a/httemplate/edit/process/cust_refund.cgi
b/httemplate/edit/process/cust_refund.cgi
index
8977ced
..
d4236bc
100755
(executable)
--- a/
httemplate/edit/process/cust_refund.cgi
+++ b/
httemplate/edit/process/cust_refund.cgi
@@
-7,7
+7,7
@@
%
<% header('Refund entered') %>
<SCRIPT TYPE="text/javascript">
%
<% header('Refund entered') %>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY></HTML>
</SCRIPT>
</BODY></HTML>
diff --git
a/httemplate/edit/process/cust_tax_adjustment.html
b/httemplate/edit/process/cust_tax_adjustment.html
index
204b5b9
..
fe23275
100644
(file)
--- a/
httemplate/edit/process/cust_tax_adjustment.html
+++ b/
httemplate/edit/process/cust_tax_adjustment.html
@@
-4,7
+4,7
@@
% } else {
<% header("Tax adjustment added") %>
<SCRIPT TYPE="text/javascript">
% } else {
<% header("Tax adjustment added") %>
<SCRIPT TYPE="text/javascript">
- //
window.top.location.
reload();
+ //
top
reload();
parent.cClick();
</SCRIPT>
</BODY></HTML>
parent.cClick();
</SCRIPT>
</BODY></HTML>
diff --git
a/httemplate/edit/process/detach-cust_pkg.html
b/httemplate/edit/process/detach-cust_pkg.html
index
782ffa5
..
34c5805
100644
(file)
--- a/
httemplate/edit/process/detach-cust_pkg.html
+++ b/
httemplate/edit/process/detach-cust_pkg.html
@@
-5,7
+5,7
@@
<% header(emt("Package detached")) %>
<SCRIPT TYPE="text/javascript">
<% header(emt("Package detached")) %>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY>
</HTML>
</SCRIPT>
</BODY>
</HTML>
diff --git
a/httemplate/edit/process/domain_record.cgi
b/httemplate/edit/process/domain_record.cgi
index
8369f71
..
9d869d5
100755
(executable)
--- a/
httemplate/edit/process/domain_record.cgi
+++ b/
httemplate/edit/process/domain_record.cgi
@@
-3,7
+3,7
@@
%} elsif ( $recnum ) { #editing
<% header('Nameservice record changed') %>
<SCRIPT TYPE="text/javascript">
%} elsif ( $recnum ) { #editing
<% header('Nameservice record changed') %>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY></HTML>
%} else { #adding
</SCRIPT>
</BODY></HTML>
%} else { #adding
diff --git
a/httemplate/edit/process/elements/ApplicationCommon.html
b/httemplate/edit/process/elements/ApplicationCommon.html
index
a73b1bc
..
67fa891
100644
(file)
--- a/
httemplate/edit/process/elements/ApplicationCommon.html
+++ b/
httemplate/edit/process/elements/ApplicationCommon.html
@@
-26,7
+26,7
@@
Examples:
%} else {
<% header("$src_thing application$to sucessful") %>
<SCRIPT TYPE="text/javascript">
%} else {
<% header("$src_thing application$to sucessful") %>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY>
</HTML>
</SCRIPT>
</BODY>
</HTML>
diff --git
a/httemplate/edit/process/elements/process.html
b/httemplate/edit/process/elements/process.html
index
60aaf74
..
76722c9
100644
(file)
--- a/
httemplate/edit/process/elements/process.html
+++ b/
httemplate/edit/process/elements/process.html
@@
-188,7
+188,7
@@
process();
<% include('/elements/header-popup.html', $opt{'popup_reload'} ) %>
<SCRIPT TYPE="text/javascript">
<% include('/elements/header-popup.html', $opt{'popup_reload'} ) %>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY>
</SCRIPT>
</BODY>
diff --git
a/httemplate/edit/process/quick-charge.cgi
b/httemplate/edit/process/quick-charge.cgi
index
d1b8e10
..
00d17c8
100644
(file)
--- a/
httemplate/edit/process/quick-charge.cgi
+++ b/
httemplate/edit/process/quick-charge.cgi
@@
-1,4
+1,13
@@
+% if ( $error ) {
+% $cgi->param('error', $error );
<% $cgi->redirect($redirect) %>
<% $cgi->redirect($redirect) %>
+% } else {
+<% header(emt($message)) %>
+ <SCRIPT TYPE="text/javascript">
+ topreload();
+ </SCRIPT>
+ </BODY></HTML>
+% }
<%init>
my $curuser = $FS::CurrentUser::CurrentUser;
<%init>
my $curuser = $FS::CurrentUser::CurrentUser;
diff --git
a/httemplate/edit/process/quotation_pkg_detail.html
b/httemplate/edit/process/quotation_pkg_detail.html
index
b836bae
..
5728832
100644
(file)
--- a/
httemplate/edit/process/quotation_pkg_detail.html
+++ b/
httemplate/edit/process/quotation_pkg_detail.html
@@
-6,7
+6,7
@@
% } else {
<% header($action) %>
<SCRIPT TYPE="text/javascript">
% } else {
<% header($action) %>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY></HTML>
% }
</SCRIPT>
</BODY></HTML>
% }
diff --git
a/httemplate/elements/header-full.html
b/httemplate/elements/header-full.html
index
07595a5
..
850eaed
100644
(file)
--- a/
httemplate/elements/header-full.html
+++ b/
httemplate/elements/header-full.html
@@
-53,7
+53,7
@@
Example:
% }
<% include('init_overlib.html') |n %>
<% include('rs_init_object.html') |n %>
% }
<% include('init_overlib.html') |n %>
<% include('rs_init_object.html') |n %>
-
+ <script type="text/javascript" src="<% $fsurl %>elements/topreload.js"></script>
<% $head |n %>
%# announce our base path, and the Mason comp path of this page
<% $head |n %>
%# announce our base path, and the Mason comp path of this page
diff --git
a/httemplate/elements/header-popup.html
b/httemplate/elements/header-popup.html
index
6c0f80b
..
839a636
100644
(file)
--- a/
httemplate/elements/header-popup.html
+++ b/
httemplate/elements/header-popup.html
@@
-34,6
+34,7
@@
Example:
<SCRIPT SRC="<% $fsurl %>elements/printtofit.js"></SCRIPT>
% }
% }
<SCRIPT SRC="<% $fsurl %>elements/printtofit.js"></SCRIPT>
% }
% }
+ <SCRIPT SRC="<% $fsurl %>elements/topreload.js"></SCRIPT>
<% $head |n %>
</HEAD>
<BODY <% $etc |n %>>
<% $head |n %>
</HEAD>
<BODY <% $etc |n %>>
diff --git a/httemplate/elements/topreload.js
b/httemplate/elements/topreload.js
new file mode 100644
(file)
index 0000000..
a66703b
--- /dev/null
+++ b/
httemplate/elements/topreload.js
@@ -0,0
+1,5
@@
+window.topreload = function() {
+ if (window != window.top) {
+ window.top.location.reload();
+ }
+}
diff --git
a/httemplate/misc/cust_main-cancel.cgi
b/httemplate/misc/cust_main-cancel.cgi
index
f6fd1e9
..
73c4deb
100755
(executable)
--- a/
httemplate/misc/cust_main-cancel.cgi
+++ b/
httemplate/misc/cust_main-cancel.cgi
@@
-1,6
+1,6
@@
<& /elements/header-popup.html, mt("Customer cancelled") &>
<SCRIPT TYPE="text/javascript">
<& /elements/header-popup.html, mt("Customer cancelled") &>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY>
</HTML>
</SCRIPT>
</BODY>
</HTML>
diff --git
a/httemplate/misc/cust_main-suspend.cgi
b/httemplate/misc/cust_main-suspend.cgi
index
7a501d6
..
e81e2b4
100755
(executable)
--- a/
httemplate/misc/cust_main-suspend.cgi
+++ b/
httemplate/misc/cust_main-suspend.cgi
@@
-1,6
+1,6
@@
<& /elements/header-popup.html, mt("Customer suspended") &>
<SCRIPT TYPE="text/javascript">
<& /elements/header-popup.html, mt("Customer suspended") &>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY>
</HTML>
</SCRIPT>
</BODY>
</HTML>
diff --git
a/httemplate/misc/cust_main-unsuspend.cgi
b/httemplate/misc/cust_main-unsuspend.cgi
index
e8ac8d3
..
99ec70a
100755
(executable)
--- a/
httemplate/misc/cust_main-unsuspend.cgi
+++ b/
httemplate/misc/cust_main-unsuspend.cgi
@@
-1,6
+1,6
@@
<& /elements/header-popup.html, mt("Customer unsuspended") &>
<SCRIPT TYPE="text/javascript">
<& /elements/header-popup.html, mt("Customer unsuspended") &>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY>
</HTML>
</SCRIPT>
</BODY>
</HTML>
diff --git
a/httemplate/misc/delete-addr_range.html
b/httemplate/misc/delete-addr_range.html
index
c6310e9
..
239332d
100644
(file)
--- a/
httemplate/misc/delete-addr_range.html
+++ b/
httemplate/misc/delete-addr_range.html
@@
-3,7
+3,7
@@
% } else {
<& /elements/header-popup.html, "Address range deleted" &>
<SCRIPT TYPE="text/javascript">
% } else {
<& /elements/header-popup.html, "Address range deleted" &>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY>
</HTML>
</SCRIPT>
</BODY>
</HTML>
diff --git
a/httemplate/misc/delete-rate_detail.html
b/httemplate/misc/delete-rate_detail.html
index
30856a7
..
b4d31b3
100755
(executable)
--- a/
httemplate/misc/delete-rate_detail.html
+++ b/
httemplate/misc/delete-rate_detail.html
@@
-3,7
+3,7
@@
% } else {
<% header('Rate deleted') %>
<SCRIPT TYPE="text/javascript">
% } else {
<% header('Rate deleted') %>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY></HTML>
% }
</SCRIPT>
</BODY></HTML>
% }
diff --git
a/httemplate/misc/did_order_confirmed.html
b/httemplate/misc/did_order_confirmed.html
index
53dbb2f
..
3cc121c
100644
(file)
--- a/
httemplate/misc/did_order_confirmed.html
+++ b/
httemplate/misc/did_order_confirmed.html
@@
-14,7
+14,7
@@
die "access denied"
my $action = $1;
my $header = '';
my $popup = '';
my $action = $1;
my $header = '';
my $popup = '';
-my $js = '
window.top.location.
reload();';
+my $js = '
top
reload();';
$cgi->param('ordernum') =~ /^(\d+)$/ or die 'illegal ordernum';
my $ordernum = $1;
$cgi->param('ordernum') =~ /^(\d+)$/ or die 'illegal ordernum';
my $ordernum = $1;
diff --git
a/httemplate/misc/disable-cust_location.cgi
b/httemplate/misc/disable-cust_location.cgi
index
ee7ba1d
..
677f0b8
100755
(executable)
--- a/
httemplate/misc/disable-cust_location.cgi
+++ b/
httemplate/misc/disable-cust_location.cgi
@@
-1,6
+1,6
@@
<% header("Location disabled") %>
<SCRIPT TYPE="text/javascript">
<% header("Location disabled") %>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY>
</HTML>
</SCRIPT>
</BODY>
</HTML>
diff --git
a/httemplate/misc/disable-msg_template.cgi
b/httemplate/misc/disable-msg_template.cgi
index
1eb4d25
..
565eb2c
100644
(file)
--- a/
httemplate/misc/disable-msg_template.cgi
+++ b/
httemplate/misc/disable-msg_template.cgi
@@
-3,7
+3,7
@@
% } else {
<& /elements/header-popup.html, "Template ${actioned}" &>
<SCRIPT TYPE="text/javascript">
% } else {
<& /elements/header-popup.html, "Template ${actioned}" &>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY>
</HTML>
</SCRIPT>
</BODY>
</HTML>
diff --git
a/httemplate/misc/process/bulk_pkg_increment_bill.cgi
b/httemplate/misc/process/bulk_pkg_increment_bill.cgi
index
0d8417b
..
8da8495
100755
(executable)
--- a/
httemplate/misc/process/bulk_pkg_increment_bill.cgi
+++ b/
httemplate/misc/process/bulk_pkg_increment_bill.cgi
@@
-4,7
+4,7
@@
%} else {
<% header('Packages Adjusted') %>
<SCRIPT TYPE="text/javascript">
%} else {
<% header('Packages Adjusted') %>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY></HTML>
% }
</SCRIPT>
</BODY></HTML>
% }
diff --git
a/httemplate/misc/process/cancel_pkg.html
b/httemplate/misc/process/cancel_pkg.html
index
eb3b2ef
..
46ba06a
100755
(executable)
--- a/
httemplate/misc/process/cancel_pkg.html
+++ b/
httemplate/misc/process/cancel_pkg.html
@@
-1,6
+1,6
@@
<% header(emt("Package $past_method")) %>
<SCRIPT TYPE="text/javascript">
<% header(emt("Package $past_method")) %>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY>
</HTML>
</SCRIPT>
</BODY>
</HTML>
diff --git
a/httemplate/misc/process/change_pkg_contact.html
b/httemplate/misc/process/change_pkg_contact.html
index
2795c11
..
5bf8962
100644
(file)
--- a/
httemplate/misc/process/change_pkg_contact.html
+++ b/
httemplate/misc/process/change_pkg_contact.html
@@
-1,6
+1,6
@@
<% header(emt("Package contact $past_method")) %>
<SCRIPT TYPE="text/javascript">
<% header(emt("Package contact $past_method")) %>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY>
</HTML>
</SCRIPT>
</BODY>
</HTML>
diff --git
a/httemplate/misc/process/cust_bill-promised_date.html
b/httemplate/misc/process/cust_bill-promised_date.html
index
721a763
..
f390609
100644
(file)
--- a/
httemplate/misc/process/cust_bill-promised_date.html
+++ b/
httemplate/misc/process/cust_bill-promised_date.html
@@
-1,4
+1,4
@@
-<SCRIPT TYPE="text/javascript">
window.top.location.
reload()</SCRIPT>
+<SCRIPT TYPE="text/javascript">
top
reload()</SCRIPT>
<%init>
# XXX ACL?
die "access denied"
<%init>
# XXX ACL?
die "access denied"
diff --git
a/httemplate/misc/process/delay_susp_pkg.html
b/httemplate/misc/process/delay_susp_pkg.html
index
675da04
..
15a3c96
100755
(executable)
--- a/
httemplate/misc/process/delay_susp_pkg.html
+++ b/
httemplate/misc/process/delay_susp_pkg.html
@@
-1,6
+1,6
@@
<% header($msg) %>
<SCRIPT TYPE="text/javascript">
<% header($msg) %>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY>
</HTML>
</SCRIPT>
</BODY>
</HTML>
diff --git
a/httemplate/misc/process/enable_or_disable_tax.html
b/httemplate/misc/process/enable_or_disable_tax.html
index
9b7324b
..
8a7a559
100755
(executable)
--- a/
httemplate/misc/process/enable_or_disable_tax.html
+++ b/
httemplate/misc/process/enable_or_disable_tax.html
@@
-4,7
+4,7
@@
<% include('/elements/header-popup.html', $title) %>
<SCRIPT TYPE="text/javascript">
<% include('/elements/header-popup.html', $title) %>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY>
</SCRIPT>
</BODY>
diff --git
a/httemplate/misc/process/nms-add_iface.html
b/httemplate/misc/process/nms-add_iface.html
index
79e6856
..
cbd0fc0
100644
(file)
--- a/
httemplate/misc/process/nms-add_iface.html
+++ b/
httemplate/misc/process/nms-add_iface.html
@@
-1,6
+1,6
@@
<& /elements/header-popup.html, 'Interface added' &>
<SCRIPT TYPE="text/javascript">
<& /elements/header-popup.html, 'Interface added' &>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY></HTML>
<%init>
</SCRIPT>
</BODY></HTML>
<%init>
diff --git
a/httemplate/misc/process/nms-add_router.html
b/httemplate/misc/process/nms-add_router.html
index
c3b42a8
..
a4c3423
100644
(file)
--- a/
httemplate/misc/process/nms-add_router.html
+++ b/
httemplate/misc/process/nms-add_router.html
@@
-1,6
+1,6
@@
<& /elements/header-popup.html, 'Router added' &>
<SCRIPT TYPE="text/javascript">
<& /elements/header-popup.html, 'Router added' &>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY></HTML>
<%init>
</SCRIPT>
</BODY></HTML>
<%init>
diff --git
a/httemplate/misc/process/recharge_svc.html
b/httemplate/misc/process/recharge_svc.html
index
2d49f6b
..
88a1f7f
100755
(executable)
--- a/
httemplate/misc/process/recharge_svc.html
+++ b/
httemplate/misc/process/recharge_svc.html
@@
-4,7
+4,7
@@
%} else {
<% header("Package recharged") %>
<SCRIPT TYPE="text/javascript">
%} else {
<% header("Package recharged") %>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY></HTML>
%}
</SCRIPT>
</BODY></HTML>
%}
diff --git
a/httemplate/misc/process/unhold_pkg.html
b/httemplate/misc/process/unhold_pkg.html
index
6940480
..
7e54262
100755
(executable)
--- a/
httemplate/misc/process/unhold_pkg.html
+++ b/
httemplate/misc/process/unhold_pkg.html
@@
-1,6
+1,6
@@
<& /elements/header-popup.html &>
<SCRIPT TYPE="text/javascript">
<& /elements/header-popup.html &>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY>
</HTML>
</SCRIPT>
</BODY>
</HTML>
diff --git
a/httemplate/misc/process/void-cust_bill.html
b/httemplate/misc/process/void-cust_bill.html
index
7773b0b
..
32a2fc5
100755
(executable)
--- a/
httemplate/misc/process/void-cust_bill.html
+++ b/
httemplate/misc/process/void-cust_bill.html
@@
-4,7
+4,7
@@
%} else {
<& /elements/header-popup.html, 'Invoice voided' &>
<SCRIPT TYPE="text/javascript">
%} else {
<& /elements/header-popup.html, 'Invoice voided' &>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY></HTML>
%}
</SCRIPT>
</BODY></HTML>
%}
diff --git
a/httemplate/misc/reason-merge.html
b/httemplate/misc/reason-merge.html
index
14f5ebb
..
b7e4df4
100644
(file)
--- a/
httemplate/misc/reason-merge.html
+++ b/
httemplate/misc/reason-merge.html
@@
-1,7
+1,7
@@
% if ($success) {
<% include('/elements/header-popup.html', 'Reason Merge Success') %>
<SCRIPT>
% if ($success) {
<% include('/elements/header-popup.html', 'Reason Merge Success') %>
<SCRIPT>
-
window.top.location.
reload()
+
top
reload()
</SCRIPT>
% } else {
<% include('/elements/header-popup.html', 'Merge Reasons') %>
</SCRIPT>
% } else {
<% include('/elements/header-popup.html', 'Merge Reasons') %>
diff --git
a/httemplate/misc/void-cust_credit.html
b/httemplate/misc/void-cust_credit.html
index
1e71f00
..
81ba31d
100755
(executable)
--- a/
httemplate/misc/void-cust_credit.html
+++ b/
httemplate/misc/void-cust_credit.html
@@
-1,7
+1,7
@@
%if ( $success ) {
<& /elements/header-popup.html, mt("Credit voided") &>
<SCRIPT TYPE="text/javascript">
%if ( $success ) {
<& /elements/header-popup.html, mt("Credit voided") &>
<SCRIPT TYPE="text/javascript">
-
window.top.location.
reload();
+
top
reload();
</SCRIPT>
</BODY>
</HTML>
</SCRIPT>
</BODY>
</HTML>