forward port of profile field bugfix
This commit is contained in:
parent
00ec65b92d
commit
32f5e71fc4
2 changed files with 4 additions and 3 deletions
|
|
@ -28,6 +28,7 @@
|
||||||
- fix [ 1423815 ] snippet v6.8.5
|
- fix [ 1423815 ] snippet v6.8.5
|
||||||
- fix [ 1421056 ] LDAP Recursive Property Bug
|
- fix [ 1421056 ] LDAP Recursive Property Bug
|
||||||
- fix [ 1404350 ] no hoverHelp for InOutBoard
|
- fix [ 1404350 ] no hoverHelp for InOutBoard
|
||||||
|
- fix [ 1410127 ] User profile fields do not display value \'0\'
|
||||||
|
|
||||||
6.8.5
|
6.8.5
|
||||||
- fix [ 1396957 ] Insufficient privileges check on the DataForm
|
- fix [ 1396957 ] Insufficient privileges check on the DataForm
|
||||||
|
|
|
||||||
|
|
@ -143,11 +143,11 @@ sub formField {
|
||||||
}
|
}
|
||||||
$properties->{options} = $orderedValues;
|
$properties->{options} = $orderedValues;
|
||||||
my $default;
|
my $default;
|
||||||
if ($self->session->form->process($properties->{name})) {
|
if (defined $self->session->form->process($properties->{name})) {
|
||||||
$default = $self->session->form->process($properties->{name});
|
$default = $self->session->form->process($properties->{name});
|
||||||
} elsif (defined $u && $u->profileField($properties->{name})) {
|
} elsif (defined $u && defined $u->profileField($properties->{name})) {
|
||||||
$default = $u->profileField($properties->{name});
|
$default = $u->profileField($properties->{name});
|
||||||
} elsif (!defined $u && $self->session->user->profileField($properties->{name})) {
|
} elsif (!defined $u && defined $self->session->user->profileField($properties->{name})) {
|
||||||
$default = $self->session->user->profileField($properties->{name});
|
$default = $self->session->user->profileField($properties->{name});
|
||||||
} else {
|
} else {
|
||||||
$default = WebGUI::Operation::Shared::secureEval($self->session,$properties->{dataDefault});
|
$default = WebGUI::Operation::Shared::secureEval($self->session,$properties->{dataDefault});
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue