From 8bfe7506a00fe9d3a828fdd6a555019dc63fd3f9 Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Tue, 2 Apr 2019 17:17:11 +0200 Subject: [PATCH] integrations: fixed missing template variable for fork reference checks. --- rhodecode/apps/repository/views/repo_settings_advanced.py | 6 ------ rhodecode/integrations/views.py | 6 +++++- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/rhodecode/apps/repository/views/repo_settings_advanced.py b/rhodecode/apps/repository/views/repo_settings_advanced.py index ec511f5e..10436a30 100644 --- a/rhodecode/apps/repository/views/repo_settings_advanced.py +++ b/rhodecode/apps/repository/views/repo_settings_advanced.py @@ -67,12 +67,6 @@ class RepoSettingsView(RepoAppView): .filter(UserFollowing.user_id == c.default_user_id) \ .filter(UserFollowing.follows_repository == self.db_repo).scalar() - c.has_origin_repo_read_perm = False - if self.db_repo.fork: - c.has_origin_repo_read_perm = h.HasRepoPermissionAny( - 'repository.write', 'repository.read', 'repository.admin')( - self.db_repo.fork.repo_name, 'repo set as fork page') - c.ver_info_dict = self.rhodecode_vcs_repo.get_hooks_info() return self._get_template_context(c) diff --git a/rhodecode/integrations/views.py b/rhodecode/integrations/views.py index 3497a65e..c04fcff4 100644 --- a/rhodecode/integrations/views.py +++ b/rhodecode/integrations/views.py @@ -114,7 +114,6 @@ class IntegrationSettingsViewBase(BaseAppView): _ = self.request.translate c = super(IntegrationSettingsViewBase, self)._get_local_tmpl_context( include_app_defaults=include_app_defaults) - c.active = 'integrations' return c @@ -404,6 +403,11 @@ class RepoIntegrationsView(IntegrationSettingsViewBase): c.repo_name = self.db_repo.repo_name c.repository_pull_requests = ScmModel().get_pull_requests(self.repo) + c.has_origin_repo_read_perm = False + if self.db_repo.fork: + c.has_origin_repo_read_perm = h.HasRepoPermissionAny( + 'repository.write', 'repository.read', 'repository.admin')( + self.db_repo.fork.repo_name, 'summary fork link') return c @LoginRequired()