[freeside-commits] branch master updated. c0886229d19cfa798580fbeb342826fd11ceeeb0

Jonathan Prykop jonathan at 420.am
Mon Nov 16 17:32:08 PST 2015


The branch, master has been updated
       via  c0886229d19cfa798580fbeb342826fd11ceeeb0 (commit)
      from  06ba67f2db8e73955cd98e25927c4c6751539426 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c0886229d19cfa798580fbeb342826fd11ceeeb0
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Mon Nov 16 19:32:09 2015 -0600

    RT#17480: Freeside Cancel Reason [small fixes]

diff --git a/httemplate/misc/reason-merge.html b/httemplate/misc/reason-merge.html
index a531e58..14f5ebb 100644
--- 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>
-<!-- 
 window.top.location.reload()
--->
 </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 = "No desitation reason selected.";
+    $error = "No destination reason selected.";
   }
 }
 

-----------------------------------------------------------------------

Summary of changes:
 httemplate/misc/reason-merge.html |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)




More information about the freeside-commits mailing list