vitalif
/
bugzilla-4intranet
mirror of https://github.com/vitalif/bugzilla-4intranet
1
0
Fork 0
Code Issues Releases Wiki Activity

Bug 57248 

1) Guess description from file name
2) Throw error if attachment description is empty when creating new bug


git-svn-id: svn://svn.office.custis.ru/3rdparty/bugzilla.org/trunk@542 6955db30-a419-402b-8a0d-67ecbb4d7f56
master
vfilippov 2009-11-25 17:15:50 +00:00
parent 301c9a7d77
commit ba8b2f7e94
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/attachment.js
View File

@ -67,11 +67,24 @@ function URLFieldHandler() {
}
}
function DataFieldHandler() {
function DataFieldHandler(AllowAttachUrl)
{
var field_data = document.getElementById("data");
var fd_empty = field_data.value.match(/^\s*$/);
var field_description = document.getElementById("description");
if (!field_description._changed && !fd_empty)
{
l = field_data.value.lastIndexOf('/')+1;
lw = field_data.value.lastIndexOf('\\')+1;
if (lw > l)
l = lw;
field_description.value = field_data.value.substr(l);
}
if (!AllowAttachUrl)
return;
var greyfields = new Array("attachurl");
var i, thisfield;
if (field_data.value.match(/^\s*$/)) {
if (fd_empty) {
for (i = 0; i < greyfields.length; i++) {
thisfield = document.getElementById(greyfields[i]);
if (thisfield) {

2
post_bug.cgi
View File

@ -227,7 +227,7 @@ if (defined $cgi->param('version')) {
if (defined($cgi->upload('data')) || $cgi->param('attachurl') ||
$cgi->param('text_attachment')) {
$cgi->param('isprivate', $cgi->param('commentprivacy'));
my $attachment = Bugzilla::Attachment->create(!THROW_ERROR,
my $attachment = Bugzilla::Attachment->create(THROW_ERROR,
$bug, $user, $timestamp, $vars);
if ($attachment) {

6
template/en/default/attachment/createformcontents.html.tmpl
View File

@ -44,9 +44,7 @@ function switch_afot(fot)
<td>
<em>Enter the path to the file on your computer.</em><br>
<input type="file" id="data" name="data" size="50"
[% IF Param("allow_attach_url") %]
onchange="DataFieldHandler()"
[% END %]
onchange="DataFieldHandler([% Param("allow_attach_url") ? 1 : 0 %])"
>
</td>
</tr>
@ -85,7 +83,7 @@ function switch_afot(fot)
<th><label for="description">Description</label>:</th>
<td>
<em>Describe the attachment briefly.</em><br>
<input type="text" id="description" name="description" size="60" maxlength="200">
<input type="text" id="description" name="description" size="60" maxlength="200" onchange="this._changed=true">
</td>
</tr>
<tr class="expert_fields">