From 4e2e6e45a5654313a252d9f11052af8b9d7f3287 Mon Sep 17 00:00:00 2001
From: Andreas Granig <agranig@sipwise.com>
Date: Tue, 19 Mar 2013 13:52:10 +0000
Subject: [PATCH] Revert r13200 as this was stupid.

---
 lib/admin/Controller/peering.pm | 15 +++----
 root/tt/peering.tt              | 69 +++++++++------------------------
 2 files changed, 23 insertions(+), 61 deletions(-)

diff --git a/lib/admin/Controller/peering.pm b/lib/admin/Controller/peering.pm
index f8f1a42..c1f9650 100644
--- a/lib/admin/Controller/peering.pm
+++ b/lib/admin/Controller/peering.pm
@@ -122,13 +122,10 @@ sub create_grp : Local {
         unless $settings{name} =~ /^[a-zA-Z0-9_\-]+/;
     $settings{priority} = $c->request->params->{priority};
     $settings{description} = $c->request->params->{grpdesc};
-    $settings{outbound_peering_contract_id} = $c->request->params->{outbound_peering_contract_id}
-        if $c->request->params->{outbound_peering_contract_id};
+    $settings{peering_contract_id} = $c->request->params->{peering_contract_id}
+        if $c->request->params->{peering_contract_id};
     $messages{cpeererr} = 'Client.Voip.NoPeerContract'
-        unless (defined $settings{outbound_peering_contract_id} && $settings{outbound_peering_contract_id} =~ /^[0-9]+/);
-    # keep inbound peering contracts optional
-    $settings{inbound_peering_contract_id} = $c->request->params->{inbound_peering_contract_id}
-        if($c->request->params->{inbound_peering_contract_id} && $c->request->params->{inbound_peering_contract_id} =~ /^[0-9]+/);
+        unless (defined $settings{peering_contract_id} && $settings{peering_contract_id} =~ /^[0-9]+/);
 
     unless(keys %messages) {
         if($c->model('Provisioning')->call_prov( $c, 'voip', 'create_peer_group',
@@ -167,13 +164,11 @@ sub edit_grp : Local {
     my $grpid = $c->request->params->{grpid};
     $settings{priority} = $c->request->params->{priority};
     $settings{description} = $c->request->params->{grpdesc};
-    $settings{outbound_peering_contract_id} = $c->request->params->{outbound_peering_contract_id} || undef;
-    $settings{inbound_peering_contract_id} = $c->request->params->{inbound_peering_contract_id} || undef;
+    $settings{peering_contract_id} = $c->request->params->{peering_contract_id} || undef;
 
-    unless(defined $settings{outbound_peering_contract_id}) {
+    unless(defined $settings{peering_contract_id}) {
         $messages{epeererr} = 'Client.Voip.NoPeerContract';
     }
-    # inbound peering contracts are optional
 
     unless(keys %messages) {
         if($c->model('Provisioning')->call_prov( $c, 'voip', 'update_peer_group',
diff --git a/root/tt/peering.tt b/root/tt/peering.tt
index a257b9b..356aa51 100644
--- a/root/tt/peering.tt
+++ b/root/tt/peering.tt
@@ -48,17 +48,12 @@
           
           <ul class="cleanlist">
             <li class="ui-state-default">
-              <div class="span-4">Name</div>
+              <div class="span-5">Name</div>
               <div class="span-2">Priority</div>
-              <div class="span-4">Description</div>
-              <div class="span-2">
-              [% IF Catalyst.config.billing_features %]
-                <span style="font-size:9px;">Outbound Contract ID</span>
-              [% END %]
-              </div>
+              <div class="span-5">Description</div>
               <div class="span-2 last">
               [% IF Catalyst.config.billing_features %]
-                 <span style="font-size:9px;">Inbound Contract ID</span>
+                Contract ID
               [% END %]
               </div>
             </li>
@@ -66,7 +61,7 @@
             [% FOREACH grp = peer_groups %]
               <li class="ui-state-default">
                 [% IF grp.id == editid %]
-                  <div class="span-4">[% grp.name %]</div>
+                  <div class="span-5">[% grp.name %]</div>
                   <form action="/peering/edit_grp" method="post">
                     <input type="hidden" name="grpid" value="[% grp.id %]" />
                     <div class="span-2">
@@ -78,29 +73,17 @@
 						[% END %]
 					  </select>
                     </div>
-                    <div class="span-4">
-                      <input type="text" size="15" id="addtxt" title="string, description of group"
+                    <div class="span-5">
+                      <input type="text" id="addtxt" title="string, description of group"
                              name="grpdesc" value="[% grp.description %]" />
                     </div>
                     <div class="span-2">
                     [% IF Catalyst.config.billing_features %]
-                      <select size="1" name="outbound_peering_contract_id">
-                        <option value="0" [% UNLESS grp.outbound_peering_contract_id %]selected="selected"[% END %]>&nbsp;</option>
+                      <select size="1" name="peering_contract_id">
+                        <option value="0" [% UNLESS grp.peering_contract_id %]selected="selected"[% END %]>&nbsp;</option>
                         [% FOREACH contract = contracts %]
                           <option value="[% contract.id %]"
-                                  [% IF grp.outbound_peering_contract_id == contract.id %]selected="selected"[% END %]
-                                 >[% contract.id %]</option>
-                        [% END %]
-                      </select>
-                    [% END %]
-                    </div>
-                    <div class="span-2">
-                    [% IF Catalyst.config.billing_features %]
-                      <select size="1" name="inbound_peering_contract_id">
-                        <option value="0" [% UNLESS grp.inbound_peering_contract_id %]selected="selected"[% END %]>&nbsp;</option>
-                        [% FOREACH contract = contracts %]
-                          <option value="[% contract.id %]"
-                                  [% IF grp.inbound_peering_contract_id == contract.id %]selected="selected"[% END %]
+                                  [% IF grp.peering_contract_id == contract.id %]selected="selected"[% END %]
                                  >[% contract.id %]</option>
                         [% END %]
                       </select>
@@ -114,17 +97,12 @@
                       <a href="/peering"><span class="button-cancel">Cancel</span></a>
                   </div>
                 [% ELSE %]
-                  <div class="span-4"><a href="/peering/detail?group_id=[%grp.id%]">[% grp.name %]</a></div>
+                  <div class="span-5"><a href="/peering/detail?group_id=[%grp.id%]">[% grp.name %]</a></div>
                   <div class="span-2">[% grp.priority %]</div>
-                  <div class="span-4">[% grp.description %]</div>
+                  <div class="span-5">[% grp.description %]</div>
                   <div class="span-2">
                   [% IF Catalyst.config.billing_features %]
-                    [% grp.outbound_peering_contract_id %]
-                  [% END %]
-                  </div>
-                  <div class="span-2">
-                  [% IF Catalyst.config.billing_features %]
-                    [% grp.inbound_peering_contract_id %]
+                    [% grp.peering_contract_id %]
                   [% END %]
                   </div>
                   <div class="prepend-1 span-1">
@@ -148,8 +126,8 @@
       [% UNLESS Catalyst.session.admin.read_only %]
             <form action="/peering/create_grp" method="post">
               <li class="ui-state-default">
-                <div class="span-4">
-                  <input type="text" size="15" name="grpname" title="string, name of group"
+                <div class="span-5">
+                  <input type="text" size="20" name="grpname" title="string, name of group"
                          id="addtxt" value="[% garefill.name %]" />
                 </div>
                 <div class="span-2">
@@ -161,27 +139,16 @@
                     [% END %]
                   </select>
                 </div>
-                <div class="span-4">
-                  <input type="text" size="15" name="grpdesc" title="string, description of group"
+                <div class="span-5">
+                  <input type="text" size="20" name="grpdesc" title="string, description of group"
                          id="addtxt" value="[% garefill.description %]" />
                 </div>
                 <div class="span-2">
               [% IF Catalyst.config.billing_features %]
-                  <select size="1" name="outbound_peering_contract_id">
-                    [% FOREACH contract = contracts %]
-                      <option value="[% contract.id %]"
-                              [% IF garefill.outbound_peering_contract_id == contract.id %]selected="selected"[% END %]
-                             >[% contract.id %]</option>
-                    [% END %]
-                  </select>
-              [% END %]
-                </div>
-                <div class="span-2">
-              [% IF Catalyst.config.billing_features %]
-                  <select size="1" name="inbound_peering_contract_id">
+                  <select size="1" name="peering_contract_id">
                     [% FOREACH contract = contracts %]
                       <option value="[% contract.id %]"
-                              [% IF garefill.inbound_peering_contract_id == contract.id %]selected="selected"[% END %]
+                              [% IF garefill.peering_contract_id == contract.id %]selected="selected"[% END %]
                              >[% contract.id %]</option>
                     [% END %]
                   </select>