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

pull-requests: fix problem with empty instances on creating PR from origin repo

Browse source
This commit is contained in:
Marcin Kuzminski 2016-10-03 11:09:36 +02:00
parent cc4ab6dae7
commit 3dd481e54c
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
rhodecode/controllers/pullrequests.py
View file

@ -298,10 +298,12 @@ class PullrequestsController(BaseRepoController):
redirect(url('pullrequest_home', repo_name=source_repo.repo_name))
default_target_repo = source_repo
if (source_repo.parent and
not source_repo.parent.scm_instance().is_empty()):
# change default if we have a parent repo
default_target_repo = source_repo.parent
if source_repo.parent:
parent_vcs_obj = source_repo.parent.scm_instance()
if parent_vcs_obj and not parent_vcs_obj.is_empty():
# change default if we have a parent repo
default_target_repo = source_repo.parent
target_repo_data = PullRequestModel().generate_repo_data(
default_target_repo)
@ -363,7 +365,8 @@ class PullrequestsController(BaseRepoController):
add_parent = False
if repo.parent:
if filter_query in repo.parent.repo_name:
if not repo.parent.scm_instance().is_empty():
parent_vcs_obj = repo.parent.scm_instance()
if parent_vcs_obj and not parent_vcs_obj.is_empty():
add_parent = True
limit = 20 - 1 if add_parent else 20