diff --git a/rhodecode/api/views/repo_api.py b/rhodecode/api/views/repo_api.py --- a/rhodecode/api/views/repo_api.py +++ b/rhodecode/api/views/repo_api.py @@ -1437,7 +1437,7 @@ def comment_commit( renderer = rc_config.get('rhodecode_markup_renderer', 'rst') status_change_label = ChangesetStatus.get_status_lbl(status) comm = ChangesetCommentsModel().create( - message, repo, user, revision=commit_id, + message, repo, user, commit_id=commit_id, status_change=status_change_label, status_change_type=status, renderer=renderer) diff --git a/rhodecode/controllers/changeset.py b/rhodecode/controllers/changeset.py --- a/rhodecode/controllers/changeset.py +++ b/rhodecode/controllers/changeset.py @@ -350,7 +350,7 @@ class ChangesetController(BaseRepoContro text=text, repo=c.rhodecode_db_repo.repo_id, user=c.rhodecode_user.user_id, - revision=current_id, + commit_id=current_id, f_path=request.POST.get('f_path'), line_no=request.POST.get('line'), status_change=(ChangesetStatus.get_status_lbl(status) diff --git a/rhodecode/model/comment.py b/rhodecode/model/comment.py --- a/rhodecode/model/comment.py +++ b/rhodecode/model/comment.py @@ -81,8 +81,8 @@ class ChangesetCommentsModel(BaseModel): log.error(traceback.format_exc()) return global_renderer - def create(self, text, repo, user, revision=None, pull_request=None, - f_path=None, line_no=None, status_change=None, + def create(self, text, repo, user, commit_id=None, pull_request=None, + f_path=None, line_no=None, status_change=None, comment_type=None, status_change_type=None, closing_pr=False, send_email=True, renderer=None): """ @@ -93,14 +93,16 @@ class ChangesetCommentsModel(BaseModel): :param text: :param repo: :param user: - :param revision: + :param commit_id: :param pull_request: :param f_path: :param line_no: :param status_change: Label for status change + :param comment_type: Type of comment :param status_change_type: type of status change :param closing_pr: :param send_email: + :param renderer: pick renderer for this comment """ if not text: log.warning('Missing text for comment, skipping...') @@ -119,8 +121,6 @@ class ChangesetCommentsModel(BaseModel): comment.f_path = f_path comment.line_no = line_no - #TODO (marcink): fix this and remove revision as param - commit_id = revision pull_request_id = pull_request commit_obj = None