kallithea Changeset - bb735ce0ccbb

Changeset - bb735ce0ccbb

Parent rev.

Child rev.

[Not reviewed]

kallithea-2.2.5-rebrand

0 3 0

Bradley M. Kuhn - 11 years ago 2014-07-03 01:05:31
bkuhn@sfconservancy.org

Rename set_rhodecode_config to set_app_settings

3 files changed with 6 insertions and 6 deletions:

kallithea/config/environment.py

kallithea/controllers/admin/settings.py

kallithea/lib/utils.py

0 comments (0 inline, 0 general)

kallithea/config/environment.py

➞

Show inline comments

@@ @@ -30,13 +30,13 @@ from kallithea.lib import celerypylons @@
 import kallithea.lib.app_globals as app_globals
 from kallithea.config.routing import make_map
 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
 from kallithea.model import init_model
 from kallithea.model.scm import ScmModel
@@ @@ -114,13 +114,13 @@ def load_environment(global_conf, app_co @@
     sa_engine_db1 = engine_from_config(config, 'sqlalchemy.db1.')
     init_model(sa_engine_db1)
     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 == '*':
         instance_id = '%s-%s' % (platform.uname()[1], os.getpid())
         kallithea.CONFIG['instance_id'] = instance_id

kallithea/controllers/admin/settings.py

➞

Show inline comments

@@ @@ -35,13 +35,13 @@ from pylons.i18n.translation import _ @@
 from kallithea.lib import helpers as h
 from kallithea.lib.auth import LoginRequired, HasPermissionAllDecorator
 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
 from kallithea.model.scm import ScmModel
 from kallithea.model.notification import EmailNotificationModel
 from kallithea.model.meta import Session
@@ @@ -261,13 +261,13 @@ class SettingsController(BaseController) @@
                 sett5 = RhodeCodeSetting.create_or_update('captcha_private_key',
                                     form_result['rhodecode_captcha_private_key'])
                 Session().add(sett5)
                 Session().commit()
-                set_rhodecode_config(config)
+                set_app_settings(config)
                 h.flash(_('Updated application settings'), category='success')
             except Exception:
                 log.error(traceback.format_exc())
                 h.flash(_('Error occurred during updating '
                           'application settings'),
@@ @@ -318,13 +318,13 @@ class SettingsController(BaseController) @@
                 for setting, form_key, type_ in settings:
                     sett = RhodeCodeSetting.create_or_update(setting,
                                         form_result[form_key], type_)
                     Session().add(sett)
                 Session().commit()
-                set_rhodecode_config(config)
+                set_app_settings(config)
                 h.flash(_('Updated visualisation settings'),
                         category='success')
             except Exception:
                 log.error(traceback.format_exc())
                 h.flash(_('Error occurred during updating '

kallithea/lib/utils.py

➞

Show inline comments

@@ @@ -391,13 +391,13 @@ def make_ui(read_from='file', path=None, @@
                                  False)
         if clear_session:
             meta.Session.remove()
     return baseui
-def set_rhodecode_config(config):
+def set_app_settings(config):
     """
     Updates pylons config with new settings from database
     :param config:
     """
     hgsettings = RhodeCodeSetting.get_app_settings()

0 comments (0 inline, 0 general)