Skip to content

Commit 34b0ff7

Browse files
Gonchik TsymzhitovGonchik Tsymzhitov
authored andcommitted
Confluence: cleaner bugfix
1 parent 65903d8 commit 34b0ff7

File tree

2 files changed

+17
-5
lines changed

2 files changed

+17
-5
lines changed

atlassian/confluence.py

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -227,16 +227,28 @@ def remove_page_from_trash(self, page_id):
227227
:param page_id:
228228
:return:
229229
"""
230-
url = 'rest/api/content/{page_id}?status=trashed'.format(page_id=page_id)
231-
return self.delete(url)
230+
return self.remove_page(page_id=page_id, status='trashed')
232231

233-
def remove_page(self, page_id):
232+
def remove_page_as_draft(self, page_id):
233+
"""
234+
This method removed page from trash
235+
:param page_id:
236+
:return:
237+
"""
238+
return self.remove_page(page_id=page_id, status='draft')
239+
240+
def remove_page(self, page_id, status=None):
234241
"""
235242
This method removed page
236243
:param page_id:
244+
:param status: OPTIONAL: type of page
237245
:return:
238246
"""
239-
url = 'rest/api/content/{page_id}'.format(page_id=page_id)
247+
if status is None:
248+
url = 'rest/api/content/{page_id}'.format(page_id=page_id)
249+
else:
250+
url = 'rest/api/content/{page_id}?status={status}'.format(page_id=page_id, status=status)
251+
240252
return self.delete(url)
241253

242254
def create_page(self, space, title, body, parent_id=None, type='page'):

atlassian/rest_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def log_curl_debug(self, method, path, data=None, headers=None, level=logging.DE
3131
password=self.password,
3232
headers=' -H '.join(["'{0}: {1}'".format(key, value) for key, value in headers.items()]),
3333
data='' if not data else "--data '{0}'".format(json.dumps(data)),
34-
url='{0}{1}'.format(self.url, path))
34+
url='{0}'.format(urljoin(self.url, path)))
3535
log.log(level=level, msg=message)
3636

3737
def resource_url(self, resource):

0 commit comments

Comments
 (0)