Module: tools Branch: master Commit: 9cea5cde40a7e132ecdc738c738fb377c116a54b URL: https://source.winehq.org/git/tools.git/?a=commit;h=9cea5cde40a7e132ecdc738c...
Author: Francois Gouget fgouget@codeweavers.com Date: Wed Mar 2 17:02:34 2022 +0100
testbot/cgi: Show all errors, even about hidden parameters.
Hiding errors related to hidden parameters causes actions to have no effect which is very confusing. So show these errors too but prefix them with text hinting they are likely internal errors.
Signed-off-by: Francois Gouget fgouget@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
testbot/lib/ObjectModel/CGI/FormPage.pm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 735755f..0ac599e 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -108,18 +108,17 @@ sub GenerateBody($) $self->GenerateFields(); $self->GenerateRequiredLegend();
- if (defined($self->{ErrMessage})) + if (defined $self->{ErrMessage}) { - my $PropertyDescriptor; - if (defined($self->{ErrField})) + if (defined $self->{ErrField}) { - $PropertyDescriptor = $self->GetPropertyDescriptorByName($self->{ErrField}); - } - if (! defined($PropertyDescriptor) || - $self->DisplayProperty($PropertyDescriptor)) - { - $self->GenerateErrorPopup(); + my $PropertyDescriptor = $self->GetPropertyDescriptorByName($self->{ErrField}); + if ($PropertyDescriptor and !$self->DisplayProperty($PropertyDescriptor)) + { + $self->{ErrMessage} = "Internal error?\n$self->{ErrMessage}"; + } } + $self->GenerateErrorPopup(); } $self->GenerateActions(); $self->GenerateFormEnd();