From 979f4b8bec49bf4b0e2df22830c8ad334deff8b2 Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Fri, 7 Jul 2017 10:26:11 +0200 Subject: [PATCH] repo-model: don't rely on global pylons context variable to fetch the clone uri template. --- rhodecode/model/db.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py index 3e6399e0..9edf73ee 100644 --- a/rhodecode/model/db.py +++ b/rhodecode/model/db.py @@ -1957,6 +1957,7 @@ class Repository(Base, BaseModel): return clone_uri def clone_url(self, **override): + from rhodecode.model.settings import SettingsModel uri_tmpl = None if 'with_id' in override: @@ -1969,14 +1970,9 @@ class Repository(Base, BaseModel): # we didn't override our tmpl from **overrides if not uri_tmpl: - uri_tmpl = self.DEFAULT_CLONE_URI - try: - from pylons import tmpl_context as c - uri_tmpl = c.clone_uri_tmpl - except Exception: - # in any case if we call this outside of request context, - # ie, not having tmpl_context set up - pass + rc_config = SettingsModel().get_all_settings(cache=True) + uri_tmpl = rc_config.get( + 'rhodecode_clone_uri_tmpl') or self.DEFAULT_CLONE_URI request = get_current_request() return get_clone_url(request=request,