fix bug in enum display

in the modal to edit preferences only relevant enums should be displayed
agranig/1_0_subfix
Gerhard Jungwirth 12 years ago
parent 1253d10e31
commit 5e5b221bbf

@ -222,10 +222,16 @@ sub preferences_edit :Chained('preferences_base') :PathPart('edit') :Args(0) {
$c->stash(edit_preference => 1);
my @enums = $c->stash->{preference_meta}
->voip_preferences_enums
->search({dom_pref => 1})
->all;
my $pref_rs = $c->stash->{preference};
NGCP::Panel::Utils::create_preference_form( c => $c,
pref_rs => $pref_rs,
enums => \@enums,
base_uri => $c->uri_for_action('/domain/preferences', [$c->req->captures->[0]]),
edit_uri => $c->uri_for_action('/domain/preferences_edit', $c->req->captures),
);

@ -323,10 +323,15 @@ sub servers_preferences_edit :Chained('servers_preferences_base') :PathPart('edi
$c->stash(edit_preference => 1);
my @enums = $c->stash->{preference_meta}
->voip_preferences_enums
->all;
my $pref_rs = $c->stash->{server_result}->voip_peer_preferences;
NGCP::Panel::Utils::create_preference_form( c => $c,
pref_rs => $pref_rs,
enums => \@enums,
base_uri => $c->uri_for_action('/peering/servers_preferences_root', [@{ $c->req->captures }[0,1]]),
edit_uri => $c->uri_for_action('/peering/servers_preferences_edit', $c->req->captures),
);

@ -118,15 +118,12 @@ sub create_preference_form {
my $pref_rs = $params{pref_rs};
my $base_uri = $params{base_uri};
my $edit_uri = $params{edit_uri};
my @enums = $c->stash->{preference_meta}
->voip_preferences_enums
->all;
my $enums = $params{enums};
my $form = NGCP::Panel::Form::Preferences->new({
fields_data => [{
meta => $c->stash->{preference_meta},
enums => \@enums,
enums => $enums,
}],
});
$form->create_structure([$c->stash->{preference_meta}->attribute]);
@ -233,6 +230,7 @@ Put them to stash as "pref_groups". This will be used in F<helpers/pref_table.tt
Parameters:
c - set this to $c
pref_rs - a resultset for voip_x_preferences with the specific "x" already set
enums - arrayref of all relevant enum rows (already filtered by eg. dom_pref)
base_uri - string, uri of the preferences list
edit_uri - string, uri to show the preferences edit modal

Loading…
Cancel
Save