This commit was manufactured by cvs2svn to create tag 'freeside_2_1_0'.

[freeside.git] / httemplate / browse / cgp_rule.html

diff --git a/httemplate/browse/cgp_rule.html b/httemplate/browse/cgp_rule.html
index 8a427b8..6f7b3e0 100644 (file)
--- a/httemplate/browse/cgp_rule.html
+++ b/httemplate/browse/cgp_rule.html
@@ -26,45 +26,25 @@ my $svcnum = $1;
 #agent virt so you can't do cross-agent communigate rules
 my $cust_svc = qsearchs('cust_svc', { 'svcnum' => $svcnum })
   or die 'unknown svcnum';
-my $part_svc = $cust_svc->part_svc;
 
 my $count_query = "SELECT COUNT(*) FROM cgp_rule WHERE svcnum = $svcnum";
 
 my($svc_label, $svc_value, $svcdb) = $cust_svc->label;
 
+
 my $view = FS::UI::Web::svc_url( 'm'        => $m,
                                  'action'   => 'view',
-                                 'part_svc' => $part_svc, 
+                                 'part_svc' => $cust_svc->part_svc, 
                                  'svc'      => $cust_svc,
                                );
 
 my $html_init =
   qq(<A HREF="$view">View this $svc_label</A><BR><BR>).
-  qq!<A HREF="${p}edit/cgp_rule.html?svcnum=$svcnum">Add new rule</A><BR>!;
-
-if ( $part_svc->svcdb eq 'svc_domain' ) {
-
-  #areyousure for adding these?
-
-  foreach my $line ( FS::Conf->new->config('cgp_rule-domain_templates') ) {
-    $line =~ /^\s*(\d+)\s+(.+)\s*$/ or next;
-    my($t_svcnum, $t_name) = ( $1, $2 );
-    $html_init .=
-      qq!<A HREF="${p}misc/clone-cgp_rule.html?clone=$t_svcnum;svcnum=$svcnum">!
-       ."Add $t_name rule</A><BR>";
-  }
-
-}
-
-$html_init .=
-  '<BR>'.
+  qq!<A HREF="${p}edit/cgp_rule.html?svcnum=$svcnum">Add new rule</A><BR><BR>!.
   qq!
   <SCRIPT>
-    function areyousure_delete(href) {
-     areyousure(href,"Are you sure you want to delete this rule?");
-    }
-    function areyousure(href,message) {
-     if (confirm(message) == true)
+    function areyousure(href) {
+     if (confirm("Are you sure you want to delete this rule?") == true)
        window.location.href = href;
     }
   </SCRIPT>
@@ -75,7 +55,7 @@ my $condition_sub = sub {
 
   [ map {
           [
-            { data  => $_->conditionname,
+            { data  => $_->condition,
               #align =>
             },
             { data  => $_->op,
@@ -107,7 +87,7 @@ my $action_sub = sub {
 my $edit_sub = [ $p.'edit/cgp_rule.html?', 'rulenum' ];
 my $del_sub = sub {
   my $rulenum = shift->rulenum;
-  [ "javascript:areyousure_delete('${p}misc/delete-cgp_rule.html?$rulenum')", '' ];
+  [ "javascript:areyousure('${p}misc/delete-cgp_rule.html?$rulenum')", '' ];
 };
 
 </%init>