MT#4967 Do not show password on edit

but update it, if one is supplied
sub edit_master is now explicitly denied to subscribers, as there is already
a lot of conditional logic there, we should consider to handle a logged in
subscriber separately. (This option is not exposed to subscribers anyway.)
See also 4967#c28533

lib/NGCP/Panel/Controller/Subscriber.pm

@@ -1667,7 +1667,7 @@ sub reglist :Chained('master') :PathPart('regdevices') :Args(0) {
     );
 }
 
-sub edit_master :Chained('master') :PathPart('edit') :Args(0) {
+sub edit_master :Chained('master') :PathPart('edit') :Args(0) :Does(ACL) :ACLDetachTo('/denied_page') :AllowedRole(admin) :AllowedRole(reseller) :AllowedRole(subscriberadmin) {
     my ($self, $c) = @_;
 
     $c->detach('/denied_page')
@@ -1725,8 +1725,6 @@ sub edit_master :Chained('master') :PathPart('edit') :Args(0) {
     }
     unless($posted) {
         $params->{webusername} = $prov_subscriber->webusername;
-        $params->{webpassword} = $prov_subscriber->webpassword;
-        $params->{password} = $prov_subscriber->password;
         $params->{administrative} = $prov_subscriber->admin;
         if($subscriber->primary_number) {
             $params->{e164}->{cc} = $subscriber->primary_number->cc;
@@ -1769,18 +1767,12 @@ sub edit_master :Chained('master') :PathPart('edit') :Args(0) {
         $params->{external_id} = $subscriber->external_id;
 
         $params->{lock} = $lock->first ? $lock->first->value : undef;
-        $params = $params->merge($c->session->{created_objects});
     }
 
     $form->process(
         posted => $posted,
         params => $c->request->params,
         item => $params,
-        update_field_list => {
-                $subadmin_pbx ?  (alias_select => {
-                    ajax_src => "".$c->uri_for_action("/subscriber/aliases_ajax", $c->req->captures)
-                }) : (),
-            }
     );
 
     NGCP::Panel::Utils::Navigation::check_form_buttons(
@@ -1803,8 +1795,10 @@ sub edit_master :Chained('master') :PathPart('edit') :Args(0) {
             $schema->txn_do(sub {
                 my $prov_params = {};
                 $prov_params->{webusername} = $form->params->{webusername};
-                $prov_params->{webpassword} = $form->params->{webpassword};
-                $prov_params->{password} = $form->params->{password};
+                $prov_params->{webpassword} = $form->params->{webpassword}
+                    if($form->params->{webpassword});
+                $prov_params->{password} = $form->params->{password}
+                    if($form->params->{password});
                 $prov_params->{admin} = $form->params->{administrative} // 0
                     if($is_admin);
                 $prov_params->{pbx_group_id} = $form->params->{group}{id}

lib/NGCP/Panel/Form/Customer/PbxExtensionSubscriberEdit.pm

@@ -26,16 +26,19 @@ has_block 'fields' => (
     render_list => [qw/group extension display_name webusername webpassword password status external_id/ ],
 );
 
-sub field_list {
+sub update_fields {
     my $self = shift;
     my $c = $self->ctx;
+    my $pkg = __PACKAGE__;
+    $c->log->debug("my form: $pkg");
 
     my $group = $self->field('group');
     $group->field('id')->ajax_src(
         $c->uri_for_action('/customer/pbx_group_ajax', [$c->stash->{customer_id}])->as_string
     );
-}
 
+    $self->field('password')->required(0); # optional on edit
+}
 
 1;
 

lib/NGCP/Panel/Form/Customer/PbxExtensionSubscriberEditSubadmin.pm

@@ -22,6 +22,24 @@ has_block 'fields' => (
     render_list => [qw/group extension display_name webusername webpassword password external_id alias_select/ ],
 );
 
+sub update_fields {
+    my $self = shift;
+    my $c = $self->ctx;
+    my $pkg = __PACKAGE__;
+    $c->log->debug("my form: $pkg");
+
+    $self->field('alias_select')->ajax_src(
+            "".$c->uri_for_action("/subscriber/aliases_ajax", $c->req->captures)
+        );
+
+    my $group = $self->field('group');
+    $group->field('id')->ajax_src(
+        $c->uri_for_action('/customer/pbx_group_ajax', [$c->stash->{customer_id}])->as_string
+    );
+
+    $self->field('password')->required(0); # optional on edit
+}
+
 1;
 
 =head1 NAME

lib/NGCP/Panel/Form/Customer/PbxExtensionSubscriberEditSubadminNoGroup.pm

@@ -22,6 +22,19 @@ has_block 'fields' => (
     render_list => [qw/display_name webusername webpassword password external_id alias_select/ ],
 );
 
+sub update_fields {
+    my $self = shift;
+    my $c = $self->ctx;
+    my $pkg = __PACKAGE__;
+    $c->log->debug("my form: $pkg");
+
+    $self->field('alias_select')->ajax_src(
+            "".$c->uri_for_action("/subscriber/aliases_ajax", $c->req->captures)
+        );
+
+    $self->field('password')->required(0); # optional on edit
+}
+
 1;
 
 =head1 NAME

lib/NGCP/Panel/Form/SubscriberEdit.pm

@@ -138,6 +138,12 @@ has_block 'actions' => (
     render_list => [qw/save/],
 );
 
+sub update_fields {
+    my $self = shift;
+
+    $self->field('password')->required(0); # optional on edit
+}
+
 1;
 
 # vim: set tabstop=4 expandtab: