Skip to content

Commit 22c6988

Browse files
mroelandtsmroelandts
andauthored
Confluence: add cloud support for delete_attachment_by_id and get_attachment_history (#1473)
Added the same fix done for get_content_history_by_version_number to attachment functions for cloud servers. Co-authored-by: mroelandts <mroelandts@key.net>
1 parent e0307b5 commit 22c6988

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

atlassian/confluence.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1449,9 +1449,11 @@ def delete_attachment_by_id(self, attachment_id, version):
14491449
:param version: file version
14501450
:return:
14511451
"""
1452-
return self.delete(
1453-
"rest/experimental/content/{id}/version/{versionId}".format(id=attachment_id, versionId=version)
1454-
)
1452+
if self.cloud:
1453+
url = "rest/api/content/{id}/version/{versionId}".format(id=attachment_id, versionId=version)
1454+
else:
1455+
url = "rest/experimental/content/{id}/version/{versionId}".format(id=attachment_id, versionId=version)
1456+
return self.delete(url)
14551457

14561458
def remove_page_attachment_keep_version(self, page_id, filename, keep_last_versions):
14571459
"""
@@ -1488,7 +1490,10 @@ def get_attachment_history(self, attachment_id, limit=200, start=0):
14881490
:return
14891491
"""
14901492
params = {"limit": limit, "start": start}
1491-
url = "rest/experimental/content/{}/version".format(attachment_id)
1493+
if self.cloud:
1494+
url = "rest/api/content/{id}/version".format(id=attachment_id)
1495+
else:
1496+
url = "rest/experimental/content/{id}/version".format(id=attachment_id)
14921497
return (self.get(url, params=params) or {}).get("results")
14931498

14941499
# @todo prepare more attachments info

0 commit comments

Comments
 (0)