From d471d9b6cb8bf01544a0b8c39a365e85a5acecd7 Mon Sep 17 00:00:00 2001
From: Andreas Granig <agranig@sipwise.com>
Date: Fri, 26 Mar 2010 20:28:42 +0000
Subject: [PATCH] Added frontend implementation for priorities in domain
 rewrite rules.

---
 lib/admin/Controller/domain.pm |  4 ++++
 root/tt/domain_detail.tt       | 30 ++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/lib/admin/Controller/domain.pm b/lib/admin/Controller/domain.pm
index 09e8d7d..58e9e46 100644
--- a/lib/admin/Controller/domain.pm
+++ b/lib/admin/Controller/domain.pm
@@ -275,6 +275,7 @@ sub create_rewrite : Local {
     my $match_pattern = $c->request->params->{match_pattern};
     my $replace_pattern = $c->request->params->{replace_pattern};
     my $description = $c->request->params->{description};
+    my $priority = $c->request->params->{priority};
 
     my $a = "";
     if($field eq 'caller') { $a = 'caller'.$a; }
@@ -291,6 +292,7 @@ sub create_rewrite : Local {
                                                    match_pattern => $match_pattern,
                                                    replace_pattern => $replace_pattern,
                                                    description => $description,
+                                                   priority => $priority,
                                                  },
                                                  undef
                                                ))
@@ -331,6 +333,7 @@ sub edit_rewrite : Local {
     my $match_pattern = $c->request->params->{match_pattern};
     my $replace_pattern = $c->request->params->{replace_pattern};
     my $description = $c->request->params->{description};
+    my $priority = $c->request->params->{priority};
     
     my $a = "";
     if($field eq 'caller') { $a = 'caller'.$a; }
@@ -347,6 +350,7 @@ sub edit_rewrite : Local {
                                                    description => $description,
                                                    direction => $direction,
                                                    field => $field,
+                                                   priority => $priority,
                                                  },
                                                  undef
                                                ))
diff --git a/root/tt/domain_detail.tt b/root/tt/domain_detail.tt
index 640d11e..7d06898 100644
--- a/root/tt/domain_detail.tt
+++ b/root/tt/domain_detail.tt
@@ -16,6 +16,7 @@
             <tr class="table_header">
               <td>Match Pattern</td>
               <td>Replacement Pattern</td>
+              <td>Priority</td>
               <td>Description</td>
               <td style="width:40px;" />
               <td style="width:60px;" />
@@ -37,6 +38,10 @@
                       <input type="text" size="15" id="addtxt" title="string, replacement pattern"
                              name="replace_pattern" value="[% rule.replace_pattern %]" />
                     </td>
+                    <td>
+                      <input type="text" size="5" id="addtxt" title="int, replacement priority"
+                             name="priority" value="[% rule.priority %]" />
+                    </td>
                     <td>
                       <input type="text" size="15" id="addtxt" title="string, rewrite rule description"
                              name="description" value="[% rule.description %]" />
@@ -52,6 +57,7 @@
                 [% ELSE %]
                   <td>[% rule.match_pattern %]</td>
                   <td>[% rule.replace_pattern %]</td>
+                  <td>[% rule.priority %]</td>
                   <td>[% rule.description %]</td>
                   <td>
                   [% UNLESS Catalyst.session.admin.read_only %]
@@ -90,6 +96,10 @@
                     <input type="text" size="15" id="addtxt" title="string, replacement pattern"
                            name="replace_pattern" value="" />
                   </td>
+                  <td>
+                    <input type="text" size="5" id="addtxt" title="int, replacement priority"
+                           name="priority" value="50" />
+                  </td>
                   <td>
                     <input type="text" size="15" id="addtxt" title="string, rule description"
                            name="description" value="" />
@@ -118,6 +128,7 @@
             <tr class="table_header">
               <td>Match Pattern</td>
               <td>Replacement Pattern</td>
+              <td>Priority</td>
               <td>Description</td>
               <td style="width:40px;" />
               <td style="width:60px;" />
@@ -139,6 +150,10 @@
                       <input type="text" size="15" id="addtxt" title="string, replacement pattern"
                              name="replace_pattern" value="[% rule.replace_pattern %]" />
                     </td>
+                    <td>
+                      <input type="text" size="5" id="addtxt" title="int, replacement priority"
+                             name="priority" value="[% rule.priority %]" />
+                    </td>
                     <td>
                       <input type="text" size="15" id="addtxt" title="string, rewrite rule description"
                              name="description" value="[% rule.description %]" />
@@ -154,6 +169,7 @@
                 [% ELSE %]
                   <td>[% rule.match_pattern %]</td>
                   <td>[% rule.replace_pattern %]</td>
+                  <td>[% rule.priority %]</td>
                   <td>[% rule.description %]</td>
                   <td>
                   [% UNLESS Catalyst.session.admin.read_only %]
@@ -192,6 +208,10 @@
                     <input type="text" size="15" id="addtxt" title="string, replacement pattern"
                            name="replace_pattern" value="" />
                   </td>
+                  <td>
+                    <input type="text" size="5" id="addtxt" title="int, replacement priority"
+                           name="priority" value="50" />
+                  </td>
                   <td>
                     <input type="text" size="15" id="addtxt" title="string, rule description"
                            name="description" value="" />
@@ -220,6 +240,7 @@
             <tr class="table_header">
               <td>Match Pattern</td>
               <td>Replacement Pattern</td>
+              <td>Priority</td>
               <td>Description</td>
               <td style="width:40px;" />
               <td style="width:60px;" />
@@ -241,6 +262,10 @@
                       <input type="text" size="15" id="addtxt" title="string, replacement pattern"
                              name="replace_pattern" value="[% rule.replace_pattern %]" />
                     </td>
+                    <td>
+                      <input type="text" size="5" id="addtxt" title="int, replacement priority"
+                             name="priority" value="[% rule.priority %]" />
+                    </td>
                     <td>
                       <input type="text" size="15" id="addtxt" title="string, rewrite rule description"
                              name="description" value="[% rule.description %]" />
@@ -256,6 +281,7 @@
                 [% ELSE %]
                   <td>[% rule.match_pattern %]</td>
                   <td>[% rule.replace_pattern %]</td>
+                  <td>[% rule.priority %]</td>
                   <td>[% rule.description %]</td>
                   <td>
                   [% UNLESS Catalyst.session.admin.read_only %]
@@ -294,6 +320,10 @@
                     <input type="text" size="15" id="addtxt" title="string, replacement pattern"
                            name="replace_pattern" value="" />
                   </td>
+                  <td>
+                    <input type="text" size="5" id="addtxt" title="int, replacement priority"
+                           name="priority" value="50" />
+                  </td>
                   <td>
                     <input type="text" size="15" id="addtxt" title="string, rule description"
                            name="description" value="" />