Mercurial > kallithea

changeset 4201:bb735ce0ccbb kallithea-2.2.5-rebrand

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename set_rhodecode_config to set_app_settings
author Bradley M. Kuhn <bkuhn@sfconservancy.org>
date Wed, 02 Jul 2014 19:05:31 -0400
parents 102ae2d847cb
children 05fe69812197
files kallithea/config/environment.py kallithea/controllers/admin/settings.py kallithea/lib/utils.py
diffstat 3 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/config/environment.py	Wed Jul 02 19:05:26 2014 -0400
+++ b/kallithea/config/environment.py	Wed Jul 02 19:05:31 2014 -0400
@@ -33,7 +33,7 @@
 
 from kallithea.lib import helpers
 from kallithea.lib.auth import set_available_permissions
-from kallithea.lib.utils import repo2db_mapper, make_ui, set_rhodecode_config,\
+from kallithea.lib.utils import repo2db_mapper, make_ui, set_app_settings,\
     load_rcextensions, check_git_version, set_vcs_config
 from kallithea.lib.utils2 import engine_from_config, str2bool
 from kallithea.lib.db_manage import DbManage
@@ -117,7 +117,7 @@
     set_available_permissions(config)
     repos_path = make_ui('db').configitems('paths')[0][1]
     config['base_path'] = repos_path
-    set_rhodecode_config(config)
+    set_app_settings(config)
 
     instance_id = kallithea.CONFIG.get('instance_id')
     if instance_id == '*':
--- a/kallithea/controllers/admin/settings.py	Wed Jul 02 19:05:26 2014 -0400
+++ b/kallithea/controllers/admin/settings.py	Wed Jul 02 19:05:31 2014 -0400
@@ -38,7 +38,7 @@
 from kallithea.lib.base import BaseController, render
 from kallithea.lib.celerylib import tasks, run_task
 from kallithea.lib.exceptions import HgsubversionImportError
-from kallithea.lib.utils import repo2db_mapper, set_rhodecode_config
+from kallithea.lib.utils import repo2db_mapper, set_app_settings
 from kallithea.model.db import RhodeCodeUi, Repository, RhodeCodeSetting
 from kallithea.model.forms import ApplicationSettingsForm, \
     ApplicationUiSettingsForm, ApplicationVisualisationForm
@@ -264,7 +264,7 @@
                 Session().add(sett5)
 
                 Session().commit()
-                set_rhodecode_config(config)
+                set_app_settings(config)
                 h.flash(_('Updated application settings'), category='success')
 
             except Exception:
@@ -321,7 +321,7 @@
                     Session().add(sett)
 
                 Session().commit()
-                set_rhodecode_config(config)
+                set_app_settings(config)
                 h.flash(_('Updated visualisation settings'),
                         category='success')
 
--- a/kallithea/lib/utils.py	Wed Jul 02 19:05:26 2014 -0400
+++ b/kallithea/lib/utils.py	Wed Jul 02 19:05:31 2014 -0400
@@ -394,7 +394,7 @@
     return baseui
 
 
-def set_rhodecode_config(config):
+def set_app_settings(config):
     """
     Updates pylons config with new settings from database