fixed ignore_allowed_ips, adm_ncos and man_allowed_ips handling

lib/admin/Controller/subscriber.pm

@@ -282,7 +282,7 @@ sub detail : Local {
             $$preferences{$$pref{attribute}} =~ s/\@.*$//
                 if $$preferences{$$pref{attribute}} =~ /^\+?\d+\@/;
           }
-        } elsif($$pref{attribute} eq 'ncos') {
+        } elsif(!$c->stash->{ncos_levels} and ($$pref{attribute} eq 'ncos' or $$pref{attribute} eq 'adm_ncos')) {
           my $ncoslvl;
           return unless $c->model('Provisioning')->call_prov( $c, 'billing', 'get_ncos_levels',
                                                               undef,
@@ -624,6 +624,14 @@ sub update_preferences : Local {
         }
     }
 
+    if(defined $c->request->params->{adm_ncos}) {
+        if(length $c->request->params->{adm_ncos}) {
+            $$preferences{adm_ncos} = $c->request->params->{adm_ncos};
+        } else {
+            $$preferences{adm_ncos} = undef;
+        }
+    }
+
     ### call forwarding ###
 
     my $fw_target_select = $c->request->params->{fw_target};
@@ -743,6 +751,10 @@ sub update_preferences : Local {
 
     $$preferences{in_use} = $c->request->params->{in_use} ? 1 : undef;
 
+    ### allowed IPs override ###
+
+    $$preferences{ignore_allowed_ips} = $c->request->params->{ignore_allowed_ips} ? 1 : undef;
+
     ### save settings ###
 
     unless(keys %messages) {

root/tt/subscriber_detail.tt

@@ -238,7 +238,8 @@
                       || preference.key == "cft"
                       || preference.key == "cfna"
                       || preference.key == "mct"
-                      || preference.key == "in_use" %]
+                      || preference.key == "in_use"
+                      || preference.key == "ignore_allowed_ips" %]
                 <tr>
                   <td class="tdkey">[% preference.key %]:</td>
                   <td>
@@ -314,7 +315,7 @@
                       value="[% preference.value %]" />
                   </td>
                 </tr>
-                [% ELSIF preference.key == "ncos" %]
+                [% ELSIF preference.key == "ncos" || preference.key == "adm_ncos"%]
                 <tr>
                   <td class="tdkey">[% preference.key %]:</td>
                   <td>
@@ -365,7 +366,7 @@
                   [% END %]
                   [% IF ! edit_preferences && ! Catalyst.session.admin.read_only %]
                     &nbsp;
-                    [% IF preference.key == "allowed_ips" %]
+                    [% IF preference.key == "allowed_ips" || preference.key == "man_allowed_ips" %]
                       <a href="edit_iplist?subscriber_id=[% subscriber.subscriber_id %]&amp;list_name=[% preference.key %]"
                          class="aaction">edit list</a>
                     [% ELSE %]