Merge branch 'master' into WebGUI8. Merged up to 7.10.4

This commit is contained in:
Colin Kuskie 2010-11-03 09:47:36 -07:00
commit 5f3014aaee
66 changed files with 3078 additions and 997 deletions

View file

@ -302,25 +302,25 @@ sub toHtml {
value => 'upload',
id => $self->get('id')
})->toHtml
. "<br />";
. "\n";
}
else {
$uploadControl .= WebGUI::Form::Hidden->new($self->session, {
name => $self->get("name"),
value => $self->getOriginalValue,
id => $self->get("id")
})->toHtml()."<br />";
})->toHtml()."\n";
$uploadControl .= WebGUI::Form::Hidden->new($self->session, {
name => $self->privateName('action'),
value => 'keep',
id => $self->get("id")
})->toHtml()."<br />";
})->toHtml()."\n";
}
if (scalar(@files)) {
if ($self->get('maxAttachments') == 1) {
$self->set("");
}
$uploadControl .= $self->getFilePreview($storage);
$uploadControl .= "<br />".$self->getFilePreview($storage);
}
return $uploadControl;
}