summaryrefslogtreecommitdiff
path: root/web-ui
diff options
context:
space:
mode:
Diffstat (limited to 'web-ui')
-rw-r--r--web-ui/app/templates/mails/full_view.hbs2
-rw-r--r--web-ui/test/spec/mail_view/ui/mail_view.spec.js2
-rw-r--r--web-ui/test/test_data.js3
3 files changed, 4 insertions, 3 deletions
diff --git a/web-ui/app/templates/mails/full_view.hbs b/web-ui/app/templates/mails/full_view.hbs
index cf797ce6..f9ec084a 100644
--- a/web-ui/app/templates/mails/full_view.hbs
+++ b/web-ui/app/templates/mails/full_view.hbs
@@ -73,7 +73,7 @@
<ul>
{{#each attachments }}
<li>
- <a href="/attachment/{{ this.ident }}?encoding={{ this.encoding }}&filename={{ this.name }}">{{ this.name }} ({{ formatSize this.size}})<i class="fa fa-arrow-down download-icon"></i></a>
+ <a href="/attachment/{{ this.ident }}?content_type={{ this.content-type }}&encoding={{ this.encoding }}&filename={{ this.name }}">{{ this.name }} ({{ formatSize this.size}})<i class="fa fa-arrow-down download-icon"></i></a>
</li>
{{/each }}
</ul>
diff --git a/web-ui/test/spec/mail_view/ui/mail_view.spec.js b/web-ui/test/spec/mail_view/ui/mail_view.spec.js
index fe763919..1c1446f9 100644
--- a/web-ui/test/spec/mail_view/ui/mail_view.spec.js
+++ b/web-ui/test/spec/mail_view/ui/mail_view.spec.js
@@ -271,7 +271,7 @@ describeComponent('mail_view/ui/mail_view', function () {
this.component.displayMail({}, withAttachments);
var attachmentLink = $(this.component.$node.find('.attachmentsArea li').html());
- var expectedLink = '/attachment/912ec803b2ce49e4a541068d495ab570?encoding=base64&filename=filename.txt';
+ var expectedLink = '/attachment/912ec803b2ce49e4a541068d495ab570?content_type=text/plain&encoding=base64&filename=filename.txt';
expect(attachmentLink.attr('href')) .toBe(expectedLink);
});
diff --git a/web-ui/test/test_data.js b/web-ui/test/test_data.js
index e9388c2f..94fd74d8 100644
--- a/web-ui/test/test_data.js
+++ b/web-ui/test/test_data.js
@@ -224,7 +224,8 @@ define(function() {
attachments: [{
ident: '912ec803b2ce49e4a541068d495ab570',
name: 'filename.txt',
- encoding: 'base64'
+ encoding: 'base64',
+ 'content-type': 'text/plain'
}]
};