From 0ddb1f69f24e41f08d64c8ba65c8845bd4c56514 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Feb 27 2015 09:51:40 +0000 Subject: Adjust the call to get_issue to use get_issues --- diff --git a/progit/hooks/files/progit_hook.py b/progit/hooks/files/progit_hook.py index 10b4c28..1bdeaa5 100644 --- a/progit/hooks/files/progit_hook.py +++ b/progit/hooks/files/progit_hook.py @@ -115,7 +115,7 @@ def relates_commit(commitid, issueid, project=None): if not repo: repo = progit.lib.get_project( progit.SESSION, get_repo_name(), user=username) - issue = progit.lib.get_issue(progit.SESSION, repo.id, issueid) + issue = progit.lib.get_issues(progit.SESSION, repo.id, issueid=issueid) if issue is None or issue.project != repo: return @@ -146,7 +146,7 @@ def fixes_commit(commitid, issueid, project=None): if not repo: repo = progit.lib.get_project( progit.SESSION, get_repo_name(), user=username) - issue = progit.lib.get_issue(progit.SESSION, repo.id, issueid) + issue = progit.lib.get_issues(progit.SESSION, repo.id, issueid=issueid) if issue is None or issue.project != repo: return diff --git a/progit/ui/issues.py b/progit/ui/issues.py index 521d7c8..6d5e007 100644 --- a/progit/ui/issues.py +++ b/progit/ui/issues.py @@ -42,7 +42,7 @@ def add_comment_issue(repo, issueid, username=None): if not repo.issue_tracker: flask.abort(404, 'No issue tracker found for this project') - issue = progit.lib.get_issue(SESSION, repo.id, issueid) + issue = progit.lib.get_issues(SESSION, repo.id, issueid=issueid) if issue is None or issue.project != repo: flask.abort(404, 'Issue not found') @@ -84,7 +84,7 @@ def add_tag_issue(repo, issueid, username=None): if not repo.issue_tracker: flask.abort(404, 'No issue tracker found for this project') - issue = progit.lib.get_issue(SESSION, repo.id, issueid) + issue = progit.lib.get_issues(SESSION, repo.id, issueid=issueid) if issue is None or issue.project != repo: flask.abort(404, 'Issue not found') @@ -129,7 +129,7 @@ def add_assignee_issue(repo, issueid, username=None): if not repo.issue_tracker: flask.abort(404, 'No issue tracker found for this project') - issue = progit.lib.get_issue(SESSION, repo.id, issueid) + issue = progit.lib.get_issues(SESSION, repo.id, issueid=issueid) if issue is None or issue.project != repo: flask.abort(404, 'Issue not found') @@ -175,7 +175,7 @@ def add_dependent_issue(repo, issueid, issuetype, username=None): if not repo.issue_tracker: flask.abort(404, 'No issue tracker found for this project') - issue = progit.lib.get_issue(SESSION, repo.id, issueid) + issue = progit.lib.get_issues(SESSION, repo.id, issueid=issueid) if issue is None or issue.project != repo: flask.abort(404, 'Issue not found') @@ -184,7 +184,8 @@ def add_dependent_issue(repo, issueid, issuetype, username=None): cat = None if form.validate_on_submit(): blocked = form.depends.data - issue_blocked = progit.lib.get_issue(SESSION, repo.id, blocked) + issue_blocked = progit.lib.get_issues( + SESSION, repo.id, issueid=blocked) if issue_blocked is None or issue_blocked.project != repo: flask.abort(404, 'Issue blocked not found') @@ -417,7 +418,7 @@ def view_issue(repo, issueid, username=None): if not repo.issue_tracker: flask.abort(404, 'No issue tracker found for this project') - issue = progit.lib.get_issue(SESSION, repo.id, issueid) + issue = progit.lib.get_issues(SESSION, repo.id, issueid=issueid) if issue is None or issue.project != repo: flask.abort(404, 'Issue not found') @@ -495,7 +496,7 @@ def edit_issue(repo, issueid, username=None): flask.abort( 403, 'You are not allowed to edit issues for this project') - issue = progit.lib.get_issue(SESSION, repo.id, issueid) + issue = progit.lib.get_issues(SESSION, repo.id, issueid=issueid) if issue is None or issue.project != repo: flask.abort(404, 'Issue not found')