[freeside-commits] freeside/httemplate/view/svc_acct communigate.html, 1.2, 1.3

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/view/svc_acct
In directory wavetail.420.am:/tmp/cvs-serv6155/httemplate/view/svc_acct

Modified Files:
	communigate.html 
Log Message:
communigate account rules: vacation & redirect all, RT#7514

Index: communigate.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/svc_acct/communigate.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -d -r1.2 -r1.3
--- communigate.html	26 Jul 2010 22:59:03 -0000	1.2
+++ communigate.html	6 Aug 2010 00:45:29 -0000	1.3
@@ -54,17 +54,16 @@
                         value=>$svc_acct->cgp_sendmdnmode ) %>
 
 %# vacation message
-%#XXX finish me... do we need to search for specific rules
-%# (and hide them?)  need to see what CGP gives back after we've added a rule
   <% include('/elements/init_overlib.html') %>
 
   <TR>
     <TD ALIGN="right">Vacation message</TD>
     <TD BGCOLOR="#FFFFFF">
+      <% $vacation_rule ? 'Active' : '' %>
       <% include('/elements/popup_link.html',
                    'action' => $p.'edit/cgp_rule-vacation.html?'.
                                  'svcnum='. $svc_acct->svcnum,
-                   'label'  => '(add)', #XXX (edit)
+                   'label'  => $vacation_rule ? '(edit)' : '(add)',
                    'actionlabel' => 'Vacation message',
                    'width'  => 600,
                    'height' => 300,
@@ -75,15 +74,15 @@
   </TR>
 
 %# redirect all mail
-%#XXX finish me...
 
   <TR>
     <TD ALIGN="right">Redirect all mail</TD>
     <TD BGCOLOR="#FFFFFF">
+      <% $redirect_rule ? 'Active' : '' %>
       <% include('/elements/popup_link.html',
                    'action' => $p.'edit/cgp_rule-redirect_all.html?'.
                                  'svcnum='. $svc_acct->svcnum,
-                   'label'  => '(add)', #XXX (edit)
+                   'label'  => $redirect_rule ? '(edit)' : '(add)',
                    'actionlabel' => 'Redirect all mail',
                    'width' => 763,
                    #'height'
@@ -110,6 +109,16 @@
 #my $part_svc = $opt{'part_svc'};
 
 my $rule_link = qq(<A HREF="${p}browse/cgp_rule.html?svcnum=).
-                      $svc_acct->svcnum. '">View/edit mail rules</A>';
+                      $svc_acct->svcnum. '">View/edit mail rules</A>'; #'dum vim
+
+my $vacation_rule = qsearchs('cgp_rule', { 'svcnum' => $svc_acct->svcnum,
+                                           'name'   => '#Vacation'
+                                         }
+                            );
+
+my $redirect_rule = qsearchs('cgp_rule', { 'svcnum' => $svc_acct->svcnum,
+                                           'name'   => '#Redirect'
+                                         }
+                            );
 
 </%init>