X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Fcgp_rule.html;fp=httemplate%2Fedit%2Fcgp_rule.html;h=6f2d801616dc6285ae06ebdf23e44d8c0a577d82;hp=9c03a52f08079d202ac983659194c75e41e52cbe;hb=6874a21f3cb26a167e49cc1324df30119c6ed75d;hpb=81012d916ff893e5ca988d703d15e4a57f416307

diff --git a/httemplate/edit/cgp_rule.html b/httemplate/edit/cgp_rule.html
index 9c03a52f0..6f2d80161 100644
--- a/httemplate/edit/cgp_rule.html
+++ b/httemplate/edit/cgp_rule.html
@@ -1,10 +1,12 @@
 <% include('elements/edit.html',
              'name_singular' => 'rule',
              'table'         => 'cgp_rule',
-             'labels' => { 'rulenum'  => 'Rule',
-                           'name'     => 'Name',
-                           'comment'  => 'Comment',
-                           'priority' => 'Priority',
+             'labels' => { 'rulenum'          => 'Rule',
+                           'name'             => 'Name',
+                           'comment'          => 'Comment',
+                           'priority'         => 'Priority',
+                           'ruleconditionnum' => 'Condition',
+                           'ruleactionnum'    => 'Action',
                          },
              'fields' => [ 'name',
                            'comment',
@@ -13,7 +15,25 @@
                              'options' => [ 0 .. 10 ],
                              'labels'  => { 0 => 'Inactive' },
                            },
-                           { 'field' => 'svcnum', 'type' => 'hidden', },
+                           { 'field'   => 'svcnum', 'type' => 'hidden', },
+                           { 'type'    => 'tablebreak-tr-title',
+                             'value'   => 'Conditions',
+                           },
+                           { 'field'   => 'ruleconditionnum',
+                             'type'    => 'select-cgp_rule_condition',
+                             'o2m_table' => 'cgp_rule_condition',
+                             'm2_label' => 'Condition',
+                             #XXX m2_error_callback
+                           },
+                           { 'type'    => 'tablebreak-tr-title',
+                             'value'   => 'Actions',
+                           },
+                           { 'field'   => 'ruleactionnum',
+                             'type'    => 'select-cgp_rule_action',
+                             'o2m_table' => 'cgp_rule_action',
+                             'm2_label' => 'Action',
+                             #XXX m2_error_callback
+                           },
                          ],
              'new_callback' => sub { my( $cgi, $cgp_rule ) = @_;
                                      $cgp_rule->svcnum( $cgi->param('svcnum') );
@@ -24,7 +44,9 @@
 %>
 <%init>
 
-#my $svcnum #huh
+my %opt = @_;
+
+#my $svcnum #huh XXX
 #my $viewall_url = $p. "browse/$table.html?svcnum=$svcnum";
 
 </%init>