summaryrefslogtreecommitdiff
path: root/gitlab/objects.py
diff options
context:
space:
mode:
authorGauvain Pocentek <gauvain@pocentek.net>2016-08-07 11:41:09 +0200
committerGauvain Pocentek <gauvain@pocentek.net>2016-08-07 11:41:09 +0200
commit922041d1215dc00ecd633e4fc330fd991ad578bd (patch)
tree5509ae5da2a3cfd772a6d2bc599c1883fd18d4bf /gitlab/objects.py
parent92edb9922b178783f9307c84147352ae31f32d0b (diff)
downloadgitlab-922041d1215dc00ecd633e4fc330fd991ad578bd.tar.gz
Fix the listing of some resources
The parent ID wasn't available in the generated objects, leading to exceptions when trying to use specific methods for these objects. Fixes #132
Diffstat (limited to 'gitlab/objects.py')
-rw-r--r--gitlab/objects.py36
1 files changed, 13 insertions, 23 deletions
diff --git a/gitlab/objects.py b/gitlab/objects.py
index 5b607e0..1ce1227 100644
--- a/gitlab/objects.py
+++ b/gitlab/objects.py
@@ -1059,16 +1059,9 @@ class ProjectCommit(GitlabObject):
"""
url = '/projects/%s/repository/commits/%s/builds' % (self.project_id,
self.id)
- r = self.gitlab._raw_get(url, **kwargs)
- raise_error_from_response(r, GitlabListError)
-
- l = []
- for j in r.json():
- o = ProjectBuild(self, j)
- o._from_api = True
- l.append(o)
-
- return l
+ return self.gitlab._raw_list(url, ProjectBuild,
+ {'project_id': self.project_id},
+ **kwargs)
class ProjectCommitManager(BaseManager):
@@ -1413,7 +1406,9 @@ class ProjectMergeRequest(GitlabObject):
"""
url = ('/projects/%s/merge_requests/%s/closes_issues' %
(self.project_id, self.id))
- return self.gitlab._raw_list(url, ProjectIssue, **kwargs)
+ return self.gitlab._raw_list(url, ProjectIssue,
+ {'project_id': self.project_id},
+ **kwargs)
def commits(self, **kwargs):
"""List the merge request commits.
@@ -1427,7 +1422,9 @@ class ProjectMergeRequest(GitlabObject):
"""
url = ('/projects/%s/merge_requests/%s/commits' %
(self.project_id, self.id))
- return self.gitlab._raw_list(url, ProjectCommit, **kwargs)
+ return self.gitlab._raw_list(url, ProjectCommit,
+ {'project_id': self.project_id},
+ **kwargs)
def changes(self, **kwargs):
"""List the merge request changes.
@@ -1497,18 +1494,11 @@ class ProjectMilestone(GitlabObject):
optionalUpdateAttrs = requiredCreateAttrs + optionalCreateAttrs
shortPrintAttr = 'title'
- def issues(self):
+ def issues(self, **kwargs):
url = "/projects/%s/milestones/%s/issues" % (self.project_id, self.id)
- r = self.gitlab._raw_get(url)
- raise_error_from_response(r, GitlabDeleteError)
-
- l = []
- for j in r.json():
- o = ProjectIssue(self, j)
- o._from_api = True
- l.append(o)
-
- return l
+ return self.gitlab._raw_list(url, ProjectIssue,
+ {'project_id': self.project_id},
+ **kwargs)
class ProjectMilestoneManager(BaseManager):