# HG changeset patch # User Marcin Kuzminski # Date 2019-01-25 13:19:30 # Node ID 840bd8bd958b068ad2bdc18cf6dfc67dd69f0618 # Parent 834ca5816512eb715d0bfaf15735279a757d0f5c comments: expose a function to fetch unresolved TODOs for repository diff --git a/rhodecode/model/comment.py b/rhodecode/model/comment.py --- a/rhodecode/model/comment.py +++ b/rhodecode/model/comment.py @@ -125,7 +125,17 @@ class CommentsModel(BaseModel): return comment_versions - def get_unresolved_todos(self, pull_request, show_outdated=True): + def get_repository_unresolved_todos(self, repo): + todos = Session().query(ChangesetComment) \ + .filter(ChangesetComment.repo == repo) \ + .filter(ChangesetComment.resolved_by == None) \ + .filter(ChangesetComment.comment_type + == ChangesetComment.COMMENT_TYPE_TODO) + todos = todos.all() + + return todos + + def get_pull_request_unresolved_todos(self, pull_request, show_outdated=True): todos = Session().query(ChangesetComment) \ .filter(ChangesetComment.pull_request == pull_request) \ diff --git a/rhodecode/model/pull_request.py b/rhodecode/model/pull_request.py --- a/rhodecode/model/pull_request.py +++ b/rhodecode/model/pull_request.py @@ -1639,7 +1639,7 @@ class MergeCheck(object): return merge_check # left over TODOs - todos = CommentsModel().get_unresolved_todos(pull_request) + todos = CommentsModel().get_pull_request_unresolved_todos(pull_request) if todos: log.debug("MergeCheck: cannot merge, {} " "unresolved TODOs left.".format(len(todos)))