Patch for bug 262141: Enable the creation of bookmarkable URL for bug entry when param commentoncreate is set; patch by Shane H. W. Travis <travis@sedsystems.ca>, r=gerv, a=justdave.

This commit is contained in:
jocuri%softhome.net 2004-12-02 22:31:35 +00:00
Родитель 1387eeb60e
Коммит 648ade2d31
1 изменённых файлов: 7 добавлений и 4 удалений

Просмотреть файл

@ -74,10 +74,6 @@ my $format = GetFormat("bug/create/comment", $::FORM{'format'}, "txt");
$template->process($format->{'template'}, $vars, \$comment) $template->process($format->{'template'}, $vars, \$comment)
|| ThrowTemplateError($template->error()); || ThrowTemplateError($template->error());
# Check that if required a description has been provided
if (Param("commentoncreate") && !trim($::FORM{'comment'})) {
ThrowUserError("description_required");
}
ValidateComment($comment); ValidateComment($comment);
my $product = $::FORM{'product'}; my $product = $::FORM{'product'};
@ -120,6 +116,13 @@ if (!defined $::FORM{'short_desc'} || trim($::FORM{'short_desc'}) eq "") {
ThrowUserError("require_summary"); ThrowUserError("require_summary");
} }
# Check that if required a description has been provided
# This has to go somewhere after 'maketemplate'
# or it breaks bookmarks with no comments.
if (Param("commentoncreate") && !trim($::FORM{'comment'})) {
ThrowUserError("description_required");
}
# If bug_file_loc is "http://", the default, strip it out and use an empty # If bug_file_loc is "http://", the default, strip it out and use an empty
# value. # value.
$::FORM{'bug_file_loc'} = "" if $::FORM{'bug_file_loc'} eq 'http://'; $::FORM{'bug_file_loc'} = "" if $::FORM{'bug_file_loc'} eq 'http://';