diff --git a/rhodecode/apps/_base/__init__.py b/rhodecode/apps/_base/__init__.py --- a/rhodecode/apps/_base/__init__.py +++ b/rhodecode/apps/_base/__init__.py @@ -37,7 +37,7 @@ from rhodecode.model import user_group from rhodecode.model import user from rhodecode.model.db import User from rhodecode.model.scm import ScmModel -from rhodecode.model.settings import VcsSettingsModel +from rhodecode.model.settings import VcsSettingsModel, IssueTrackerSettingsModel from rhodecode.model.repo import ReadmeFinder log = logging.getLogger(__name__) @@ -226,6 +226,7 @@ class RepoAppView(BaseAppView): self.db_repo_name = self.db_repo.repo_name self.db_repo_pull_requests = ScmModel().get_pull_requests(self.db_repo) self.db_repo_artifacts = ScmModel().get_artifacts(self.db_repo) + self.db_repo_patterns = IssueTrackerSettingsModel(repo=self.db_repo) def _handle_missing_requirements(self, error): log.error( diff --git a/rhodecode/apps/repository/views/repo_settings_issue_trackers.py b/rhodecode/apps/repository/views/repo_settings_issue_trackers.py --- a/rhodecode/apps/repository/views/repo_settings_issue_trackers.py +++ b/rhodecode/apps/repository/views/repo_settings_issue_trackers.py @@ -31,7 +31,7 @@ from rhodecode.lib.auth import ( LoginRequired, HasRepoPermissionAnyDecorator, CSRFRequired) from rhodecode.model.forms import IssueTrackerPatternsForm from rhodecode.model.meta import Session -from rhodecode.model.settings import IssueTrackerSettingsModel, SettingsModel +from rhodecode.model.settings import SettingsModel log = logging.getLogger(__name__) @@ -53,7 +53,7 @@ class RepoSettingsIssueTrackersView(Repo c.active = 'issuetracker' c.data = 'data' - c.settings_model = IssueTrackerSettingsModel(repo=self.db_repo) + c.settings_model = self.db_repo_patterns c.global_patterns = c.settings_model.get_global_settings() c.repo_patterns = c.settings_model.get_repo_settings() @@ -79,7 +79,7 @@ class RepoSettingsIssueTrackersView(Repo def repo_issuetracker_delete(self): _ = self.request.translate uid = self.request.POST.get('uid') - repo_settings = IssueTrackerSettingsModel(repo=self.db_repo_name) + repo_settings = self.db_repo_patterns try: repo_settings.delete_entries(uid) except Exception: @@ -113,7 +113,7 @@ class RepoSettingsIssueTrackersView(Repo def repo_issuetracker_update(self): _ = self.request.translate # Save inheritance - repo_settings = IssueTrackerSettingsModel(repo=self.db_repo_name) + repo_settings = self.db_repo_patterns inherited = ( self.request.POST.get('inherit_global_issuetracker') == "inherited") repo_settings.inherit_global_settings = inherited