summaryrefslogtreecommitdiff
path: root/service/pixelated/resources
diff options
context:
space:
mode:
Diffstat (limited to 'service/pixelated/resources')
-rw-r--r--service/pixelated/resources/attachments_resource.py2
-rw-r--r--service/pixelated/resources/mails_resource.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/service/pixelated/resources/attachments_resource.py b/service/pixelated/resources/attachments_resource.py
index e7bb6bdb..51fcdd3e 100644
--- a/service/pixelated/resources/attachments_resource.py
+++ b/service/pixelated/resources/attachments_resource.py
@@ -87,7 +87,7 @@ class AttachmentsResource(Resource):
def send_location(attachment_id):
request.headers['Location'] = '/%s/%s' % (self.BASE_URL, attachment_id)
- response_json = {"attachment_id": attachment_id,
+ response_json = {"ident": attachment_id,
"content-type": _file.type,
"filename": _file.filename,
"filesize": len(_file.value)}
diff --git a/service/pixelated/resources/mails_resource.py b/service/pixelated/resources/mails_resource.py
index f9397263..3a5b6286 100644
--- a/service/pixelated/resources/mails_resource.py
+++ b/service/pixelated/resources/mails_resource.py
@@ -180,7 +180,7 @@ class MailsResource(Resource):
def _fetch_attachment_contents(self, content_dict):
attachments = content_dict.get('attachments', []) if content_dict else []
for attachment in attachments:
- retrieved_attachment = yield self._mail_service.attachment(attachment['attachment_id'])
+ retrieved_attachment = yield self._mail_service.attachment(attachment['ident'])
attachment['raw'] = retrieved_attachment['content']
content_dict['attachments'] = attachments
defer.returnValue(content_dict)