engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pull-requests: allow filter by author

Browse source
This commit is contained in:
Marcin Kuzminski 2020-04-24 11:51:37 +02:00
parent 23f9dd8816
commit 72820d2808
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rhodecode/model/pull_request.py
View file

@ -54,7 +54,7 @@ from rhodecode.model.changeset_status import ChangesetStatusModel
from rhodecode.model.comment import CommentsModel
from rhodecode.model.db import (
or_, String, cast, PullRequest, PullRequestReviewers, ChangesetStatus,
PullRequestVersion, ChangesetComment, Repository, RepoReviewRule)
PullRequestVersion, ChangesetComment, Repository, RepoReviewRule, User)
from rhodecode.model.meta import Session
from rhodecode.model.notification import NotificationModel, \
EmailNotificationModel
@ -160,8 +160,10 @@ class PullRequestModel(BaseModel):
if search_q:
like_expression = u'%{}%'.format(safe_unicode(search_q))
q = q.join(User)
q = q.filter(or_(
cast(PullRequest.pull_request_id, String).ilike(like_expression),
User.username.ilike(like_expression),
PullRequest.title.ilike(like_expression),
PullRequest.description.ilike(like_expression),
))
@ -374,8 +376,10 @@ class PullRequestModel(BaseModel):
if query:
like_expression = u'%{}%'.format(safe_unicode(query))
q = q.join(User)
q = q.filter(or_(
cast(PullRequest.pull_request_id, String).ilike(like_expression),
User.username.ilike(like_expression),
PullRequest.title.ilike(like_expression),
PullRequest.description.ilike(like_expression),
))