projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
67b1386
)
RT#17480: Freeside Cancel Reason [small fixes]
author
Jonathan Prykop
<jonathan@freeside.biz>
Tue, 17 Nov 2015 01:32:09 +0000
(19:32 -0600)
committer
Jonathan Prykop
<jonathan@freeside.biz>
Tue, 17 Nov 2015 02:22:03 +0000
(20:22 -0600)
httemplate/misc/reason-merge.html
patch
|
blob
|
history
diff --git
a/httemplate/misc/reason-merge.html
b/httemplate/misc/reason-merge.html
index
a531e58
..
14f5ebb
100644
(file)
--- a/
httemplate/misc/reason-merge.html
+++ b/
httemplate/misc/reason-merge.html
@@
-1,9
+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()
window.top.location.reload()
--->
</SCRIPT>
% } else {
<% include('/elements/header-popup.html', 'Merge Reasons') %>
</SCRIPT>
% } else {
<% include('/elements/header-popup.html', 'Merge Reasons') %>
@@
-72,7
+70,7
@@
if ($cgi->param('process_merge') && !$error) {
$error = $destreason->merge(\@reasons);
$success = 1 unless $error;
} else {
$error = $destreason->merge(\@reasons);
$success = 1 unless $error;
} else {
- $error = "No des
it
ation reason selected.";
+ $error = "No des
tin
ation reason selected.";
}
}
}
}