summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Green <sgreen+mozilla@redhat.com>2012-01-11 21:13:42 +0100
committerFrédéric Buclin <LpSolit@gmail.com>2012-01-11 21:13:42 +0100
commit26cac3c8ee9f03fa897c98d46ea5ea07369c378a (patch)
tree7c087a5e49b764ff1d3127ac4a882e438fb5bc25
parent08ba72337754e445828d10f2c12ed4c1d119556f (diff)
downloadbugzilla-26cac3c8ee9f03fa897c98d46ea5ea07369c378a.tar.gz
bugzilla-26cac3c8ee9f03fa897c98d46ea5ea07369c378a.tar.xz
Bug 717210: If all attachments are stored locally (maxattachmentsize = 0, maxlocalattachment > 0), the link to attach files to bugs is not displayed
r/a=LpSolit
-rw-r--r--template/en/default/attachment/list.html.tmpl4
-rw-r--r--template/en/default/bug/create/create.html.tmpl2
2 files changed, 3 insertions, 3 deletions
diff --git a/template/en/default/attachment/list.html.tmpl b/template/en/default/attachment/list.html.tmpl
index 4ad5e528a..fa8e4774e 100644
--- a/template/en/default/attachment/list.html.tmpl
+++ b/template/en/default/attachment/list.html.tmpl
@@ -19,7 +19,7 @@
# Frédéric Buclin <LpSolit@gmail.com>
#%]
-[% RETURN UNLESS attachments.size || Param("maxattachmentsize") %]
+[% RETURN UNLESS attachments.size || Param("maxattachmentsize") || Param("maxlocalattachment") %]
<script type="text/javascript">
<!--
@@ -160,7 +160,7 @@ function toggle_display(link) {
[% END %]
</span>
[% END %]
- [% IF Param("maxattachmentsize") %]
+ [% IF Param("maxattachmentsize") || Param("maxlocalattachment") %]
<a href="attachment.cgi?bugid=[% bugid %]&amp;action=enter">Add an attachment</a>
(proposed patch, testcase, etc.)
[% END %]
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index ee19ab5d6..3fdf56472 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -590,7 +590,7 @@ TUI_hide_default('attachment_text_field');
</tr>
[% END %]
- [% IF Param("maxattachmentsize") %]
+ [% IF Param("maxattachmentsize") || Param("maxlocalattachment") %]
<tr>
<th>Attachment:</th>
<td colspan="3">