diff options
Diffstat (limited to 'rhodecode/model/pull_request.py')
-rw-r--r-- | rhodecode/model/pull_request.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/rhodecode/model/pull_request.py b/rhodecode/model/pull_request.py index ab2e1082..6f831337 100644 --- a/rhodecode/model/pull_request.py +++ b/rhodecode/model/pull_request.py @@ -75,13 +75,13 @@ class PullRequestModel(BaseModel): new.title = title new.description = description new.author = created_by_user - self.sa.add(new) + Session().add(new) Session().flush() #members for member in set(reviewers): _usr = self._get_user(member) reviewer = PullRequestReviewers(_usr, new) - self.sa.add(reviewer) + Session().add(reviewer) #reset state to under-review ChangesetStatusModel().set_status( @@ -90,7 +90,8 @@ class PullRequestModel(BaseModel): user=created_by_user, pull_request=new ) - + revision_data = [(x.raw_id, x.message) + for x in map(org_repo.get_changeset, revisions)] #notification to reviewers notif = NotificationModel() @@ -114,7 +115,7 @@ class PullRequestModel(BaseModel): 'pr_repo_url': h.url('summary_home', repo_name=other_repo.repo_name, qualified=True,), 'pr_url': pr_url, - 'pr_revisions': revisions + 'pr_revisions': revision_data } notif.create(created_by=created_by_user, subject=subject, body=body, @@ -140,7 +141,7 @@ class PullRequestModel(BaseModel): for uid in to_add: _usr = self._get_user(uid) reviewer = PullRequestReviewers(_usr, pull_request) - self.sa.add(reviewer) + Session().add(reviewer) for uid in to_remove: reviewer = PullRequestReviewers.query()\ @@ -148,7 +149,7 @@ class PullRequestModel(BaseModel): PullRequestReviewers.pull_request==pull_request)\ .scalar() if reviewer: - self.sa.delete(reviewer) + Session().delete(reviewer) def delete(self, pull_request): pull_request = self.__get_pull_request(pull_request) @@ -158,7 +159,7 @@ class PullRequestModel(BaseModel): pull_request = self.__get_pull_request(pull_request) pull_request.status = PullRequest.STATUS_CLOSED pull_request.updated_on = datetime.datetime.now() - self.sa.add(pull_request) + Session().add(pull_request) def _get_changesets(self, alias, org_repo, org_ref, other_repo, other_ref): """ |