From 3b7b2b29fc8319b7a9db6d55a56fddbd285dcf75 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Feb 27 2015 09:54:23 +0000 Subject: Adjust the calls to get_issues to call search_issues instead --- diff --git a/progit/hooks/files/progit_hook.py b/progit/hooks/files/progit_hook.py index 1bdeaa5..743cb48 100644 --- a/progit/hooks/files/progit_hook.py +++ b/progit/hooks/files/progit_hook.py @@ -115,7 +115,8 @@ 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_issues(progit.SESSION, repo.id, issueid=issueid) + issue = progit.lib.search_issues( + progit.SESSION, repo.id, issueid=issueid) if issue is None or issue.project != repo: return @@ -146,7 +147,8 @@ 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_issues(progit.SESSION, repo.id, issueid=issueid) + issue = progit.lib.search_issues( + progit.SESSION, repo.id, issueid=issueid) if issue is None or issue.project != repo: return diff --git a/progit/lib/__init__.py b/progit/lib/__init__.py index 1f5c019..d79d047 100644 --- a/progit/lib/__init__.py +++ b/progit/lib/__init__.py @@ -286,8 +286,8 @@ def remove_issue_tags(session, project, tags): if not isinstance(tags, list): tags = [tags] - issues = get_issues(session, project, closed=False, tags=tags) - issues.extend(get_issues(session, project, closed=True, tags=tags)) + issues = search_issues(session, project, closed=False, tags=tags) + issues.extend(search_issues(session, project, closed=True, tags=tags)) msgs = [] if not issues: @@ -309,8 +309,8 @@ def edit_issue_tags(session, project, old_tag, new_tag): if not isinstance(old_tag, list): old_tags = [old_tag] - issues = get_issues(session, project, closed=False, tags=old_tags) - issues.extend(get_issues(session, project, closed=True, tags=old_tags)) + issues = search_issues(session, project, closed=False, tags=old_tags) + issues.extend(search_issues(session, project, closed=True, tags=old_tags)) msgs = [] if not issues: diff --git a/progit/ui/issues.py b/progit/ui/issues.py index 6d5e007..7697474 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_issues(SESSION, repo.id, issueid=issueid) + issue = progit.lib.search_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_issues(SESSION, repo.id, issueid=issueid) + issue = progit.lib.search_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_issues(SESSION, repo.id, issueid=issueid) + issue = progit.lib.search_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_issues(SESSION, repo.id, issueid=issueid) + issue = progit.lib.search_issues(SESSION, repo.id, issueid=issueid) if issue is None or issue.project != repo: flask.abort(404, 'Issue not found') @@ -184,7 +184,7 @@ 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_issues( + issue_blocked = progit.lib.search_issues( SESSION, repo.id, issueid=blocked) if issue_blocked is None or issue_blocked.project != repo: flask.abort(404, 'Issue blocked not found') @@ -322,7 +322,7 @@ def view_issues(repo, username=None): if status is not None: if status.lower() == 'closed': - issues = progit.lib.get_issues( + issues = progit.lib.search_issues( SESSION, repo, closed=True, @@ -331,7 +331,7 @@ def view_issues(repo, username=None): author=author, ) else: - issues = progit.lib.get_issues( + issues = progit.lib.search_issues( SESSION, repo, status=status, @@ -340,7 +340,7 @@ def view_issues(repo, username=None): author=author, ) else: - issues = progit.lib.get_issues( + issues = progit.lib.search_issues( SESSION, repo, status='Open', tags=tags, assignee=assignee, author=author) @@ -418,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_issues(SESSION, repo.id, issueid=issueid) + issue = progit.lib.search_issues(SESSION, repo.id, issueid=issueid) if issue is None or issue.project != repo: flask.abort(404, 'Issue not found') @@ -496,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_issues(SESSION, repo.id, issueid=issueid) + issue = progit.lib.search_issues(SESSION, repo.id, issueid=issueid) if issue is None or issue.project != repo: flask.abort(404, 'Issue not found')