From 6a7f65ad2a28610b921b1248151fe04b01abff85 Mon Sep 17 00:00:00 2001
From: Kirill Solomko <ksolomko@sipwise.com>
Date: Wed, 3 Apr 2019 10:28:10 +0200
Subject: [PATCH] TT#55459 fix header_rule_set preference UI filtering

    * header_rule_set preference on the UI is now
      excludes ones containing subscriber_id

Change-Id: Icdcbab7cba7d23acb8e55c842b3c7b2d9774dd55
---
 lib/NGCP/Panel/Controller/Domain.pm     | 6 ++++--
 lib/NGCP/Panel/Controller/Peering.pm    | 4 +++-
 lib/NGCP/Panel/Controller/Subscriber.pm | 5 ++++-
 lib/NGCP/Panel/Form/Header/Action.pm    | 4 ++--
 lib/NGCP/Panel/Form/Header/Condition.pm | 4 ++--
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/lib/NGCP/Panel/Controller/Domain.pm b/lib/NGCP/Panel/Controller/Domain.pm
index 0ce8c042f5..776f41aa2b 100644
--- a/lib/NGCP/Panel/Controller/Domain.pm
+++ b/lib/NGCP/Panel/Controller/Domain.pm
@@ -398,8 +398,10 @@ sub load_preference_list :Private {
         ->resultset('voip_rewrite_rule_sets')
         ->search_rs({ reseller_id => $correct_reseller_id, });
     my $header_rule_sets_rs = $c->model('DB')
-        ->resultset('voip_header_rule_sets')
-        ->search_rs({ reseller_id => $correct_reseller_id, });
+        ->resultset('voip_header_rule_sets')->search_rs({
+            reseller_id => $correct_reseller_id,
+            subscriber_id => undef,
+        });
     $c->stash(rwr_sets_rs => $rewrite_rule_sets_rs,
               rwr_sets    => [$rewrite_rule_sets_rs->all],
               hdr_sets_rs => $header_rule_sets_rs,
diff --git a/lib/NGCP/Panel/Controller/Peering.pm b/lib/NGCP/Panel/Controller/Peering.pm
index 129a51b61f..fdbbae2b55 100644
--- a/lib/NGCP/Panel/Controller/Peering.pm
+++ b/lib/NGCP/Panel/Controller/Peering.pm
@@ -512,7 +512,9 @@ sub servers_preferences_list :Chained('servers_base') :PathPart('preferences') :
     my $rewrite_rule_sets_rs = $c->model('DB')
         ->resultset('voip_rewrite_rule_sets');
     my $header_rule_sets_rs = $c->model('DB')
-        ->resultset('voip_header_rule_sets');
+        ->resultset('voip_header_rule_sets')->search({
+            subscriber_id => undef
+        });
     $c->stash(rwr_sets_rs => $rewrite_rule_sets_rs,
               rwr_sets    => [$rewrite_rule_sets_rs->all],
               hdr_sets_rs => $header_rule_sets_rs,
diff --git a/lib/NGCP/Panel/Controller/Subscriber.pm b/lib/NGCP/Panel/Controller/Subscriber.pm
index 2eb0c71e70..b008139eff 100644
--- a/lib/NGCP/Panel/Controller/Subscriber.pm
+++ b/lib/NGCP/Panel/Controller/Subscriber.pm
@@ -2506,7 +2506,10 @@ sub load_preference_list :Private {
     my $rewrite_rule_sets_rs = $c->model('DB')
         ->resultset('voip_rewrite_rule_sets')->search({ reseller_id => $reseller_id });
     my $header_rule_sets_rs = $c->model('DB')
-        ->resultset('voip_header_rule_sets')->search({ reseller_id => $reseller_id });
+        ->resultset('voip_header_rule_sets')->search({
+            reseller_id => $reseller_id,
+            subscriber_id => undef,
+        });
     $c->stash(rwr_sets_rs => $rewrite_rule_sets_rs,
               rwr_sets    => [$rewrite_rule_sets_rs->all],
               hdr_sets_rs => $header_rule_sets_rs,
diff --git a/lib/NGCP/Panel/Form/Header/Action.pm b/lib/NGCP/Panel/Form/Header/Action.pm
index 928ebcefa6..84990ea160 100644
--- a/lib/NGCP/Panel/Form/Header/Action.pm
+++ b/lib/NGCP/Panel/Form/Header/Action.pm
@@ -136,11 +136,11 @@ sub update_fields {
 
     my $c = $self->ctx;
     return unless $c;
-    return unless $c->stash->{set_result};
+    return unless $c->stash->{hm_set_result};
 
     #if ($c->stash->{create_flag} || $c->stash->{edit_flag}) {
         my $rwr_rs = $c->model('DB')->resultset('voip_rewrite_rule_sets')->search({
-            reseller_id => $c->stash->{set_result}->reseller_id,
+            reseller_id => $c->stash->{hm_set_result}->reseller_id,
         });
 
       #  my $condition = $c->stash->{condition_result};
diff --git a/lib/NGCP/Panel/Form/Header/Condition.pm b/lib/NGCP/Panel/Form/Header/Condition.pm
index 0d962295ca..cb9031b07b 100644
--- a/lib/NGCP/Panel/Form/Header/Condition.pm
+++ b/lib/NGCP/Panel/Form/Header/Condition.pm
@@ -175,10 +175,10 @@ sub options_rwr_set {
 
     my $c = $self->ctx;
     return unless $c;
-    return unless $c->stash->{set_result};
+    return unless $c->stash->{hm_set_result};
 
     my $rwr_rs = $c->model('DB')->resultset('voip_rewrite_rule_sets')->search({
-        reseller_id => $c->stash->{set_result}->reseller_id,
+        reseller_id => $c->stash->{hm_set_result}->reseller_id,
     });
 
     $field->options([