TT#14510 fix Peering Rules form "group" field processing

- move the "group" field from Rule.pm/InboundRule.pm into
      RuleEditAdmin.pm/InboundRuleEditAdmin.pm respectively
    - the "group" field is used only by the GUI rule edit forms

Change-Id: I1c1ebf883848e90c9412784c8d8610fcbebc4331

lib/NGCP/Panel/Controller/Peering.pm

@@ -6,7 +6,9 @@ use parent 'Catalyst::Controller';
 
 use NGCP::Panel::Form::Peering::Group;
 use NGCP::Panel::Form::Peering::Rule;
+use NGCP::Panel::Form::Peering::RuleEditAdmin;
 use NGCP::Panel::Form::Peering::InboundRule;
+use NGCP::Panel::Form::Peering::InboundRuleEditAdmin;
 use NGCP::Panel::Form::Peering::Server;
 use NGCP::Panel::Utils::DialogicImg;
 use NGCP::Panel::Utils::Message;
@@ -577,7 +579,7 @@ sub rules_create :Chained('rules_list') :PathPart('create') :Args(0) {
     my ($self, $c) = @_;
    
     my $posted = ($c->request->method eq 'POST');
-    my $form = NGCP::Panel::Form::Peering::Rule->new(ctx => $c, inactive => ['group']);
+    my $form = NGCP::Panel::Form::Peering::Rule->new(ctx => $c);
     $form->process(
         posted => $posted,
         params => $c->request->params,
@@ -649,7 +651,7 @@ sub rules_edit :Chained('rules_base') :PathPart('edit') :Args(0) {
     my ($self, $c) = @_;
     
     my $posted = ($c->request->method eq 'POST');
-    my $form = NGCP::Panel::Form::Peering::Rule->new(ctx => $c);
+    my $form = NGCP::Panel::Form::Peering::RuleEditAdmin->new(ctx => $c);
     $c->stash->{rule}{group}{id} = delete $c->stash->{rule}{group_id};
     $form->process(
         posted => $posted,
@@ -736,7 +738,7 @@ sub inbound_rules_create :Chained('inbound_rules_list') :PathPart('create') :Arg
     my ($self, $c) = @_;
    
     my $posted = ($c->request->method eq 'POST');
-    my $form = NGCP::Panel::Form::Peering::InboundRule->new(ctx => $c, inactive => ['group']);
+    my $form = NGCP::Panel::Form::Peering::InboundRule->new(ctx => $c);
     $form->process(
         posted => $posted,
         params => $c->request->params,
@@ -809,7 +811,7 @@ sub inbound_rules_edit :Chained('inbound_rules_base') :PathPart('edit') :Args(0)
     my ($self, $c) = @_;
     
     my $posted = ($c->request->method eq 'POST');
-    my $form = NGCP::Panel::Form::Peering::InboundRule->new(ctx => $c);
+    my $form = NGCP::Panel::Form::Peering::InboundRuleEditAdmin->new(ctx => $c);
     $c->stash->{rule}{group}{id} = delete $c->stash->{rule}{group_id};
     $form->process(
         posted => $posted,

lib/NGCP/Panel/Form/Peering/InboundRule.pm

@@ -73,17 +73,6 @@ has_field 'enabled' => (
     },
 );
 
-has_field 'group' => (
-    type => '+NGCP::Panel::Field::PeeringGroupSelect',
-    label => 'Peering Group',
-    not_nullable => 1,
-    required => 1,
-    element_attr => {
-        rel => ['tooltip'],
-        title => ['A peering group the rule belongs to.']
-    },
-);
-
 has_field 'save' => (
     type => 'Submit',
     value => 'Save',
@@ -94,7 +83,7 @@ has_field 'save' => (
 has_block 'fields' => (
     tag => 'div',
     class => [qw/modal-body/],
-    render_list => [qw/field pattern reject_code reject_reason enabled group/],
+    render_list => [qw/field pattern reject_code reject_reason enabled/],
 );
 
 has_block 'actions' => (

lib/NGCP/Panel/Form/Peering/InboundRuleEditAdmin.pm

@@ -0,0 +1,24 @@
+package NGCP::Panel::Form::Peering::InboundRuleEditAdmin;
+
+use HTML::FormHandler::Moose;
+extends 'NGCP::Panel::Form::Peering::InboundRule';
+
+has_field 'group' => (
+    type => '+NGCP::Panel::Field::PeeringGroupSelect',
+    label => 'Peering Group',
+    not_nullable => 1,
+    required => 1,
+    element_attr => {
+        rel => ['tooltip'],
+        title => ['A peering group the rule belongs to.']
+    },
+);
+
+has_block 'fields' => (
+    tag => 'div',
+    class => [qw/modal-body/],
+    render_list => [qw/field pattern reject_code reject_reason enabled group/],
+);
+
+1;
+# vim: set tabstop=4 expandtab:

lib/NGCP/Panel/Form/Peering/Rule.pm

@@ -55,17 +55,6 @@ has_field 'enabled' => (
     },
 );
 
-has_field 'group' => (
-    type => '+NGCP::Panel::Field::PeeringGroupSelect',
-    label => 'Peering Group',
-    not_nullable => 1,
-    required => 1,
-    element_attr => {
-        rel => ['tooltip'],
-        title => ['A peering group the rule belongs to.']
-    },
-);
-
 has_field 'save' => (
     type => 'Submit',
     value => 'Save',
@@ -76,7 +65,7 @@ has_field 'save' => (
 has_block 'fields' => (
     tag => 'div',
     class => [qw/modal-body/],
-    render_list => [qw/ callee_prefix callee_pattern caller_pattern description enabled group/],
+    render_list => [qw/callee_prefix callee_pattern caller_pattern description enabled/],
 );
 
 has_block 'actions' => (

lib/NGCP/Panel/Form/Peering/RuleEditAdmin.pm

@@ -0,0 +1,47 @@
+package NGCP::Panel::Form::Peering::RuleEditAdmin;
+
+use HTML::FormHandler::Moose;
+extends 'NGCP::Panel::Form::Peering::Rule';
+
+has_field 'group' => (
+    type => '+NGCP::Panel::Field::PeeringGroupSelect',
+    label => 'Peering Group',
+    not_nullable => 1,
+    required => 1,
+    element_attr => {
+        rel => ['tooltip'],
+        title => ['A peering group the rule belongs to.']
+    },
+);
+
+has_block 'fields' => (
+    tag => 'div',
+    class => [qw/modal-body/],
+    render_list => [qw/callee_prefix callee_pattern caller_pattern description enabled group/],
+);
+
+1;
+__END__
+
+=head1 NAME
+
+NGCP::Panel::Form::Peering::RuleEdit
+
+=head1 DESCRIPTION
+
+-
+
+=head1 METHODS
+
+=head1 AUTHOR
+
+Irina Peshinskaya
+
+=head1 LICENSE
+
+This library is free software. You can redistribute it and/or modify
+it under the same terms as Perl itself.
+
+=cut
+
+# vim: set tabstop=4 expandtab: