[freeside-commits] branch master updated. 15278bb4dcfaf4bdb79c7f8781320e24ef8f1e7d

Jonathan Prykop jonathan at 420.am
Sat Sep 19 16:12:12 PDT 2015


The branch, master has been updated
       via  15278bb4dcfaf4bdb79c7f8781320e24ef8f1e7d (commit)
      from  c0c5709fb022b83a482d0b35f7094505766d5868 (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 15278bb4dcfaf4bdb79c7f8781320e24ef8f1e7d
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Sat Sep 19 18:11:54 2015 -0500

    RT#35197: Apply changes button in Edit rate plan screen clears the global default [removed preserve_rate_detail, always true]

diff --git a/FS/FS/rate.pm b/FS/FS/rate.pm
index 03dde04..d26d116 100644
--- a/FS/FS/rate.pm
+++ b/FS/FS/rate.pm
@@ -469,11 +469,8 @@ sub process {
     warn "$rate replacing $old (". $param->{'ratenum'}. ")\n" if $DEBUG;
 
     my @param = ( 'job'=>$job );
-    if ($param->{'preserve_rate_detail'}) {
-      $rate->default_detailnum($old->default_detailnum);
-    } else {
-      push @param, 'rate_detail'=>\@rate_detail;
-    }
+    
+    $rate->default_detailnum($old->default_detailnum);
 
     $error = $rate->replace( $old, @param );
 
diff --git a/httemplate/edit/rate.cgi b/httemplate/edit/rate.cgi
index 183ea8a..1b052d6 100644
--- a/httemplate/edit/rate.cgi
+++ b/httemplate/edit/rate.cgi
@@ -5,7 +5,7 @@
 
 <% include('/elements/progress-init.html',
               'OneTrueForm',
-              [ 'rate', 'agentnum', 'preserve_rate_detail' ], # 'rate', 'min_', 'sec_' ],
+              [ 'rate', 'agentnum' ],
               'process/rate.cgi',
               $p.'browse/rate.cgi',
            )
@@ -27,8 +27,6 @@
 </TABLE>
 <BR>
 
-<INPUT TYPE="hidden" NAME="preserve_rate_detail" VALUE="1">
-
 <INPUT NAME="submit" TYPE="button" VALUE="<% 
   $rate->ratenum ? "Apply changes" : "Add rate plan"
 %>" onClick="document.OneTrueForm.submit.disabled=true; process();">

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

Summary of changes:
 FS/FS/rate.pm            |    7 ++-----
 httemplate/edit/rate.cgi |    4 +---
 2 files changed, 3 insertions(+), 8 deletions(-)




More information about the freeside-commits mailing list