summaryrefslogtreecommitdiffstats
path: root/template/en
diff options
context:
space:
mode:
authorByron Jones <glob@mozilla.com>2015-07-21 06:58:36 +0200
committerByron Jones <glob@mozilla.com>2015-07-21 06:58:36 +0200
commitec9b5fd81dc74c7f69d221fa529be1c2543a12a0 (patch)
treeb795db3ec24e4426786c9d325af4bd09d53adddc /template/en
parentdc8e2b4c3e3a9a14c65f25ba59b4415cdf00c7e2 (diff)
downloadbugzilla-ec9b5fd81dc74c7f69d221fa529be1c2543a12a0.tar.gz
bugzilla-ec9b5fd81dc74c7f69d221fa529be1c2543a12a0.tar.xz
Bug 1180572 - create attachment_storage parameter
Diffstat (limited to 'template/en')
-rw-r--r--template/en/default/admin/params/attachment.html.tmpl24
-rw-r--r--template/en/default/attachment/list.html.tmpl8
-rw-r--r--template/en/default/bug/create/create.html.tmpl2
-rw-r--r--template/en/default/global/user-error.html.tmpl6
4 files changed, 14 insertions, 26 deletions
diff --git a/template/en/default/admin/params/attachment.html.tmpl b/template/en/default/admin/params/attachment.html.tmpl
index 4075374bc..bdd20c676 100644
--- a/template/en/default/admin/params/attachment.html.tmpl
+++ b/template/en/default/admin/params/attachment.html.tmpl
@@ -57,19 +57,17 @@
_ " (such as <tt>1234.your.domain.com</tt>) must point to this same"
_ " $terms.Bugzilla instance.",
- allow_attachment_deletion => "If this option is on, administrators will be able to delete " _
- "the content of attachments.",
+ allow_attachment_deletion =>
+ "If this option is on, administrators will be able to delete " _
+ "the content of attachments.",
- maxattachmentsize => "The maximum size (in kilobytes) of attachments to be stored " _
- "in the database. If a file larger than this size is attached " _
- "to ${terms.abug}, $terms.Bugzilla will look at the " _
- "<a href=\"#maxlocalattachment\"><tt>maxlocalattachment</tt> parameter</a> " _
- "to determine if the file can be stored locally on the web server. " _
- "If the file size exceeds both limits, then the attachment is rejected. " _
- "Settings both parameters to 0 will prevent attaching files to ${terms.bugs}.",
+ maxattachmentsize =>
+ "The maximum size (in kilobytes) of attachments.",
- maxlocalattachment => "The maximum size (in megabytes) of attachments to be stored " _
- "locally on the web server. If set to a value lower than the " _
- "<a href=\"#maxattachmentsize\"><tt>maxattachmentsize</tt> parameter</a>, " _
- "attachments will never be kept on the local filesystem." }
+ attachment_storage =>
+ "Where attachment data should be stored. If this value is changed you " _
+ "must use <tt>scripts/mmigrate-attachments</tt> to migrate existing " _
+ "attachments.",
+
+ }
%]
diff --git a/template/en/default/attachment/list.html.tmpl b/template/en/default/attachment/list.html.tmpl
index 2b0b31584..4aae3abef 100644
--- a/template/en/default/attachment/list.html.tmpl
+++ b/template/en/default/attachment/list.html.tmpl
@@ -19,8 +19,6 @@
# Frédéric Buclin <LpSolit@gmail.com>
#%]
-[% RETURN UNLESS attachments.size || Param("maxattachmentsize") || Param("maxlocalattachment") %]
-
<script type="text/javascript">
<!--
function toggle_display(link) {
@@ -168,10 +166,8 @@ function toggle_display(link) {
[% END %]
</span>
[% END %]
- [% IF Param("maxattachmentsize") || Param("maxlocalattachment") %]
- <a href="attachment.cgi?bugid=[% bugid %]&amp;action=enter">Add an attachment</a>
- (proposed patch, testcase, etc.)
- [% END %]
+ <a href="attachment.cgi?bugid=[% bugid %]&amp;action=enter">Add an attachment</a>
+ (proposed patch, testcase, etc.)
</td>
</tr>
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index 98290f1c2..ba5d08273 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -559,7 +559,6 @@ TUI_hide_default('attachment_text_field');
</tr>
</tbody>
- [% IF Param("maxattachmentsize") || Param("maxlocalattachment") %]
<tr>
<th>Attachment:</th>
<td colspan="3">
@@ -592,7 +591,6 @@ TUI_hide_default('attachment_text_field');
</div>
</td>
</tr>
- [% END %]
</tbody>
<tbody class="expert_fields">
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index f8d8985f9..e8510b134 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -688,13 +688,9 @@
[% ELSIF error == "file_too_large" %]
[% title = "File Too Large" %]
- [%# Convert maxlocalattachment from Mb to Kb %]
- [% max_local = Param('maxlocalattachment') * 1024 %]
- [% max_limit = [Param('maxattachmentsize'), max_local] %]
The file you are trying to attach is [% filesize FILTER html %]
kilobytes (KB) in size. Attachments cannot be more than
- [%# Hack to get the max value between both limits %]
- [%+ max_limit.nsort.last FILTER html %] KB. <br>
+ [%+ Param('maxattachmentsize') FILTER html %] KB. <br>
We recommend that you store your attachment elsewhere
and then paste the URL to this file on the attachment
creation page in the appropriate text field.