Changeset - bb735ce0ccbb
[Not reviewed]
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:
0 comments (0 inline, 0 general)
kallithea/config/environment.py
Show inline comments
 
@@ -33,7 +33,7 @@ from kallithea.config.routing import mak
 

	
 
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 @@ def load_environment(global_conf, app_co
 
    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 == '*':
kallithea/controllers/admin/settings.py
Show inline comments
 
@@ -38,7 +38,7 @@ from kallithea.lib.auth import LoginRequ
 
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 @@ class SettingsController(BaseController)
 
                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 @@ class SettingsController(BaseController)
 
                    Session().add(sett)
 

	
 
                Session().commit()
 
                set_rhodecode_config(config)
 
                set_app_settings(config)
 
                h.flash(_('Updated visualisation settings'),
 
                        category='success')
 

	
kallithea/lib/utils.py
Show inline comments
 
@@ -394,7 +394,7 @@ def make_ui(read_from='file', path=None,
 
    return baseui
 

	
 

	
 
def set_rhodecode_config(config):
 
def set_app_settings(config):
 
    """
 
    Updates pylons config with new settings from database
 

	
0 comments (0 inline, 0 general)