oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor fixes related to earlier Image form control alterations.

Browse source
This commit is contained in:
Drake 2006-11-08 00:27:25 +00:00
parent bca8d214b7
commit 7604308b26
3 changed files with 30 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/WebGUI/Operation/ProfileSettings.pm
View file

@ -269,8 +269,8 @@ sub www_editProfileField {
if ($data->{fieldType} eq "Image") {
$f->yesNo(
-name=>"forceImageOnly",
-label=>$i18n->echo("Force Image Only Uploads"),
-hoverHelp=>$i18n->echo("If set to yes, this form control will only allow image file types to be uploaded through it."),
-label=>$i18n->get('forceImageOnly label'),
-hoverHelp=>$i18n->get('forceImageOnly hoverHelp'),
-value=>$data->{forceImageOnly},
-defaultValue=>1,
);

31
lib/WebGUI/ProfileField.pm
View file

@ -125,6 +125,22 @@ sub delete {
}
#-------------------------------------------------------------------
sub _formProperties {
my $self = shift;
my $properties = shift || {};
$properties->{label} = $self->getLabel unless $properties->{label};
$properties->{fieldType} = $self->get("fieldType");
$properties->{name} = $self->getId;
my $values = WebGUI::Operation::Shared::secureEval($self->session,$self->get("possibleValues")) || {};
my $orderedValues = {};
tie %{$orderedValues}, 'Tie::IxHash';
foreach my $ov (sort keys %{$values}) {
$orderedValues->{$ov} = $values->{$ov};
}
$properties->{options} = $orderedValues;
$properties->{forceImageOnly} = $self->get("forceImageOnly");
return $properties;
}
=head2 formField ( [ formProperties, withWrapper, userObject ] )
@ -146,21 +162,10 @@ A WebGUI::User object reference to use instead of the currently logged in user.
sub formField {
my $self = shift;
my $properties = shift || {};
my $properties = $self->_formProperties(shift);
my $withWrapper = shift;
my $u = shift;
my $skipDefault = shift;
$properties->{label} = $self->getLabel unless $properties->{label};
$properties->{fieldType} = $self->get("fieldType");
$properties->{name} = $self->getId;
my $values = WebGUI::Operation::Shared::secureEval($self->session,$self->get("possibleValues")) || {};
my $orderedValues = {};
tie %{$orderedValues}, 'Tie::IxHash';
foreach my $ov (sort keys %{$values}) {
$orderedValues->{$ov} = $values->{$ov};
}
$properties->{options} = $orderedValues;
$properties->{forceImageOnly} = $self->get("forceImageOnly");
my $default;
if ($skipDefault) {
} elsif (defined $self->session->form->process($properties->{name})) {
@ -193,7 +198,7 @@ Returns the value retrieved from a form post.
sub formProcess {
my $self = shift;
my $result = $self->session->form->process($self->getId,$self->get("fieldType"),WebGUI::Operation::Shared::secureEval($self->session,$self->get("dataDefault")));
my $result = $self->session->form->process($self->getId,$self->get("fieldType"),WebGUI::Operation::Shared::secureEval($self->session,$self->get("dataDefault")), $self->_formProperties);
if (ref $result eq "ARRAY") {
my @results = @$result;
for (my $count=0;$count<scalar(@results);$count++) {

11
lib/WebGUI/i18n/English/WebGUIProfile.pm
View file

@ -330,7 +330,16 @@ new categories of profile settings.
message => q|User Profile|,
lastUpdated => 1128920410,
},
'forceImageOnly label' => {
message => q|Force Image Only Uploads|,
lastUpdated => 1162945563
},
'forceImageOnly hoverHelp' => {
message => "If set to yes, this form control will only allow image file types to be uploaded through it.",
lastUpdated => 1162945563
},
};
1;