Rename caller prefix to caller pattern and add callee pattern.

3.4
Andreas Granig 14 years ago
parent e6eef64a3a
commit 4d91bcede2

@ -217,7 +217,8 @@ sub create_rule : Local {
my $grpid = $c->request->params->{grpid};
my $callee_prefix = $c->request->params->{callee_prefix};
my $caller_prefix = $c->request->params->{caller_prefix};
my $callee_pattern = $c->request->params->{callee_pattern};
my $caller_pattern = $c->request->params->{caller_pattern};
my $description = $c->request->params->{description};
# $messages{crulerr} = 'Client.Syntax.MalformedPeerGroupName'
@ -228,7 +229,8 @@ sub create_rule : Local {
{ group_id => $grpid,
data => {
callee_prefix => $callee_prefix,
caller_prefix => $caller_prefix,
callee_pattern => $callee_pattern,
caller_pattern => $caller_pattern,
description => $description
},
},
@ -310,7 +312,8 @@ sub edit_rule : Local {
my $grpid = $c->request->params->{grpid};
my $ruleid = $c->request->params->{ruleid};
my $callee_prefix = $c->request->params->{callee_prefix};
my $caller_prefix = $c->request->params->{caller_prefix};
my $callee_pattern = $c->request->params->{callee_pattern};
my $caller_pattern = $c->request->params->{caller_pattern};
my $description = $c->request->params->{description};
# $messages{crulerr} = 'Client.Syntax.MalformedPeerGroupName'
@ -321,7 +324,8 @@ sub edit_rule : Local {
{ id => $ruleid,
data => {
callee_prefix => $callee_prefix,
caller_prefix => $caller_prefix,
callee_pattern => $callee_pattern,
caller_pattern => $caller_pattern,
description => $description
},
},

@ -134,11 +134,15 @@
<input type="text" size="14 id="addtxt" title="string, callee prefix"
name="callee_prefix" value="[% rule.callee_prefix %]" />
</div>
<div class="span-4">
<input type="text" size="14" id="addtxt" title="string, callee pattern"
name="callee_pattern" value="[% rule.callee_pattern %]" />
</div>
<div class="span-4">
<input type="text" size="14" id="addtxt" title="string, caller pattern"
name="caller_prefix" value="[% rule.caller_prefix %]" />
name="caller_pattern" value="[% rule.caller_pattern %]" />
</div>
<div class="span-4 append-3">
<div class="span-4">
<input type="text" size="14" id="addtxt" title="string, rule description"
name="description" value="[% rule.description %]" />
</div>
@ -151,8 +155,9 @@
</div>
[% ELSE %]
<div class="span-4">[% rule.callee_prefix %]</div>
<div class="span-4">[% rule.caller_prefix %]</div>
<div class="span-4 append-3">[% rule.description %]</div>
<div class="span-4">[% rule.callee_pattern %]</div>
<div class="span-4">[% rule.caller_pattern %]</div>
<div class="span-4">[% rule.description %]</div>
<div class="span-1">
[% UNLESS Catalyst.session.admin.read_only %]
<a href="/peering/detail?group_id=[% grp.group.id %]&reditid=[% rule.id %]"><span class="button-edit">Edit</span></a>
@ -179,11 +184,15 @@
<input type="text" size="14" id="addtxt" title="string, callee prefix"
name="callee_prefix" value="" />
</div>
<div class="span-4">
<input type="text" size="14" id="addtxt" title="string, callee pattern"
name="callee_pattern" value="" />
</div>
<div class="span-4">
<input type="text" size="14" id="addtxt" title="string, caller pattern"
name="caller_prefix" value="" />
name="caller_pattern" value="" />
</div>
<div class="span-4 append-3">
<div class="span-4">
<input type="text" size="14" id="addtxt" title="string, rule description"
name="description" value="" />
</div>

Loading…
Cancel
Save