Skip to content

Commit 3ee13e3

Browse files
authored
Respect advanced_mode in calls of jql. (#846)
1 parent b07da6a commit 3ee13e3

File tree

1 file changed

+17
-5
lines changed

1 file changed

+17
-5
lines changed

atlassian/jira.py

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2062,15 +2062,24 @@ def project_leaders(self):
20622062

20632063
def get_project_issuekey_last(self, project):
20642064
jql = "project = {project} ORDER BY issuekey DESC".format(project=project)
2065-
return (self.jql(jql).get("issues") or {})[0]["key"]
2065+
response = self.jql(jql)
2066+
if self.advanced_mode:
2067+
return response
2068+
return (response.get("issues") or {"key": None})[0]["key"]
20662069

20672070
def get_project_issuekey_all(self, project, start=0, limit=None, expand=None):
20682071
jql = "project = {project} ORDER BY issuekey ASC".format(project=project)
2069-
return [issue["key"] for issue in self.jql(jql, start=start, limit=limit, expand=expand)["issues"]]
2072+
response = self.jql(jql, start=start, limit=limit, expand=expand)
2073+
if self.advanced_mode:
2074+
return response
2075+
return [issue["key"] for issue in response["issues"]]
20702076

20712077
def get_project_issues_count(self, project):
20722078
jql = 'project = "{project}" '.format(project=project)
2073-
return self.jql(jql, fields="*none")["total"]
2079+
response = self.jql(jql, fields="*none")
2080+
if self.advanced_mode:
2081+
return response
2082+
return response["total"]
20742083

20752084
def get_all_project_issues(self, project, fields="*all", start=0, limit=None):
20762085
"""
@@ -2082,7 +2091,10 @@ def get_all_project_issues(self, project, fields="*all", start=0, limit=None):
20822091
:return: List of Dictionary for the Issue(s) returned.
20832092
"""
20842093
jql = "project = {project} ORDER BY key".format(project=project)
2085-
return self.jql(jql, fields=fields, start=start, limit=limit)["issues"]
2094+
response = self.jql(jql, fields=fields, start=start, limit=limit)
2095+
if self.advanced_mode:
2096+
return response
2097+
return response["issues"]
20862098

20872099
def get_all_assignable_users_for_project(self, project_key, start=0, limit=50):
20882100
"""
@@ -2387,7 +2399,7 @@ def get_all_screen_fields(self, screen_id):
23872399
Reference: https://docs.atlassian.com/software/jira/docs/api/REST/8.5.0/#api/2/search
23882400
"""
23892401

2390-
def jql(self, jql, fields="*all", start=0, limit=None, expand=None, validate_query=None):
2402+
def jql(self, jql, fields="*all", start=0, limit=None, expand=None, validate_query=None, advanced_mode=None):
23912403
"""
23922404
Get issues from jql search result with all related fields
23932405
:param jql:

0 commit comments

Comments
 (0)