Mercurial > kallithea
changeset 4203:9daad8c50b37 kallithea-2.2.5-rebrand
Rename database classes (but not table names)
line wrap: on
line diff
--- a/kallithea/controllers/admin/auth_settings.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/controllers/admin/auth_settings.py Wed Jul 02 19:05:36 2014 -0400 @@ -38,7 +38,7 @@ from kallithea.lib.auth import LoginRequired, HasPermissionAllDecorator from kallithea.lib import auth_modules from kallithea.model.forms import AuthSettingsForm -from kallithea.model.db import RhodeCodeSetting +from kallithea.model.db import Setting from kallithea.model.meta import Session log = logging.getLogger(__name__) @@ -58,7 +58,7 @@ 'kallithea.lib.auth_modules.auth_ldap', 'kallithea.lib.auth_modules.auth_crowd', ] - c.enabled_plugins = RhodeCodeSetting.get_auth_plugins() + c.enabled_plugins = Setting.get_auth_plugins() def index(self, defaults=None, errors=None, prefix_error=False): self.__load_defaults() @@ -67,7 +67,7 @@ formglobals = { "auth_plugins": ["kallithea.lib.auth_modules.auth_rhodecode"] } - formglobals.update(RhodeCodeSetting.get_auth_settings()) + formglobals.update(Setting.get_auth_settings()) formglobals["plugin_settings"] = {} formglobals["auth_plugins_shortnames"] = {} _defaults["auth_plugins"] = formglobals["auth_plugins"] @@ -82,7 +82,7 @@ if "default" in v: _defaults[fullname] = v["default"] # Current values will be the default on the form, if there are any - setting = RhodeCodeSetting.get_by_name(fullname) + setting = Setting.get_by_name(fullname) if setting: _defaults[fullname] = setting.app_settings_value # we want to show , seperated list of enabled plugins @@ -119,7 +119,7 @@ # we want to store it comma separated inside our settings v = ','.join(v) log.debug("%s = %s" % (k, str(v))) - setting = RhodeCodeSetting.create_or_update(k, v) + setting = Setting.create_or_update(k, v) Session().add(setting) Session().commit() h.flash(_('Auth settings updated successfully'),
--- a/kallithea/controllers/admin/defaults.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/controllers/admin/defaults.py Wed Jul 02 19:05:36 2014 -0400 @@ -38,7 +38,7 @@ from kallithea.model.forms import DefaultsForm from kallithea.model.meta import Session from kallithea import BACKENDS -from kallithea.model.db import RhodeCodeSetting +from kallithea.model.db import Setting log = logging.getLogger(__name__) @@ -58,7 +58,7 @@ """GET /defaults: All items in the collection""" # url('defaults') c.backends = BACKENDS.keys() - defaults = RhodeCodeSetting.get_default_repo_settings() + defaults = Setting.get_default_repo_settings() return htmlfill.render( render('admin/defaults/defaults.html'), @@ -89,7 +89,7 @@ try: form_result = _form.to_python(dict(request.POST)) for k, v in form_result.iteritems(): - setting = RhodeCodeSetting.create_or_update(k, v) + setting = Setting.create_or_update(k, v) Session().add(setting) Session().commit() h.flash(_('Default settings updated successfully'),
--- a/kallithea/controllers/admin/repos.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/controllers/admin/repos.py Wed Jul 02 19:05:36 2014 -0400 @@ -43,7 +43,7 @@ from kallithea.lib.vcs import RepositoryError from kallithea.model.meta import Session from kallithea.model.db import User, Repository, UserFollowing, RepoGroup,\ - RhodeCodeSetting, RepositoryField + Setting, RepositoryField from kallithea.model.forms import RepoForm, RepoFieldForm, RepoPermsForm from kallithea.model.scm import ScmModel, RepoGroupList, RepoList from kallithea.model.repo import RepoModel @@ -192,7 +192,7 @@ c.new_repo = repo_name_slug(new_repo) ## apply the defaults from defaults page - defaults = RhodeCodeSetting.get_default_repo_settings(strip_prefix=True) + defaults = Setting.get_default_repo_settings(strip_prefix=True) if parent_group: defaults.update({'repo_group': parent_group})
--- a/kallithea/controllers/admin/settings.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/controllers/admin/settings.py Wed Jul 02 19:05:36 2014 -0400 @@ -39,7 +39,7 @@ from kallithea.lib.celerylib import tasks, run_task from kallithea.lib.exceptions import HgsubversionImportError from kallithea.lib.utils import repo2db_mapper, set_app_settings -from kallithea.model.db import RhodeCodeUi, Repository, RhodeCodeSetting +from kallithea.model.db import Ui, Repository, Setting from kallithea.model.forms import ApplicationSettingsForm, \ ApplicationUiSettingsForm, ApplicationVisualisationForm from kallithea.model.scm import ScmModel @@ -62,7 +62,7 @@ super(SettingsController, self).__before__() def _get_hg_ui_settings(self): - ret = RhodeCodeUi.query().all() + ret = Ui.query().all() if not ret: raise Exception('Could not get application ui settings !') @@ -104,46 +104,46 @@ ) try: - sett = RhodeCodeUi.get_by_key('push_ssl') + sett = Ui.get_by_key('push_ssl') sett.ui_value = form_result['web_push_ssl'] Session().add(sett) if c.visual.allow_repo_location_change: - sett = RhodeCodeUi.get_by_key('/') + sett = Ui.get_by_key('/') sett.ui_value = form_result['paths_root_path'] Session().add(sett) #HOOKS - sett = RhodeCodeUi.get_by_key(RhodeCodeUi.HOOK_UPDATE) + sett = Ui.get_by_key(Ui.HOOK_UPDATE) sett.ui_active = form_result['hooks_changegroup_update'] Session().add(sett) - sett = RhodeCodeUi.get_by_key(RhodeCodeUi.HOOK_REPO_SIZE) + sett = Ui.get_by_key(Ui.HOOK_REPO_SIZE) sett.ui_active = form_result['hooks_changegroup_repo_size'] Session().add(sett) - sett = RhodeCodeUi.get_by_key(RhodeCodeUi.HOOK_PUSH) + sett = Ui.get_by_key(Ui.HOOK_PUSH) sett.ui_active = form_result['hooks_changegroup_push_logger'] Session().add(sett) - sett = RhodeCodeUi.get_by_key(RhodeCodeUi.HOOK_PULL) + sett = Ui.get_by_key(Ui.HOOK_PULL) sett.ui_active = form_result['hooks_outgoing_pull_logger'] Session().add(sett) ## EXTENSIONS - sett = RhodeCodeUi.get_by_key('largefiles') + sett = Ui.get_by_key('largefiles') if not sett: #make one if it's not there ! - sett = RhodeCodeUi() + sett = Ui() sett.ui_key = 'largefiles' sett.ui_section = 'extensions' sett.ui_active = form_result['extensions_largefiles'] Session().add(sett) - sett = RhodeCodeUi.get_by_key('hgsubversion') + sett = Ui.get_by_key('hgsubversion') if not sett: #make one if it's not there ! - sett = RhodeCodeUi() + sett = Ui() sett.ui_key = 'hgsubversion' sett.ui_section = 'extensions' @@ -155,10 +155,10 @@ raise HgsubversionImportError Session().add(sett) -# sett = RhodeCodeUi.get_by_key('hggit') +# sett = Ui.get_by_key('hggit') # if not sett: # #make one if it's not there ! -# sett = RhodeCodeUi() +# sett = Ui() # sett.ui_key = 'hggit' # sett.ui_section = 'extensions' # @@ -180,7 +180,7 @@ h.flash(_('Error occurred during updating ' 'application settings'), category='error') - defaults = RhodeCodeSetting.get_app_settings() + defaults = Setting.get_app_settings() defaults.update(self._get_hg_ui_settings()) return htmlfill.render( @@ -216,7 +216,7 @@ category='success') return redirect(url('admin_settings_mapping')) - defaults = RhodeCodeSetting.get_app_settings() + defaults = Setting.get_app_settings() defaults.update(self._get_hg_ui_settings()) return htmlfill.render( @@ -243,23 +243,23 @@ encoding="UTF-8") try: - sett1 = RhodeCodeSetting.create_or_update('title', + sett1 = Setting.create_or_update('title', form_result['rhodecode_title']) Session().add(sett1) - sett2 = RhodeCodeSetting.create_or_update('realm', + sett2 = Setting.create_or_update('realm', form_result['rhodecode_realm']) Session().add(sett2) - sett3 = RhodeCodeSetting.create_or_update('ga_code', + sett3 = Setting.create_or_update('ga_code', form_result['rhodecode_ga_code']) Session().add(sett3) - sett4 = RhodeCodeSetting.create_or_update('captcha_public_key', + sett4 = Setting.create_or_update('captcha_public_key', form_result['rhodecode_captcha_public_key']) Session().add(sett4) - sett5 = RhodeCodeSetting.create_or_update('captcha_private_key', + sett5 = Setting.create_or_update('captcha_private_key', form_result['rhodecode_captcha_private_key']) Session().add(sett5) @@ -275,7 +275,7 @@ return redirect(url('admin_settings_global')) - defaults = RhodeCodeSetting.get_app_settings() + defaults = Setting.get_app_settings() defaults.update(self._get_hg_ui_settings()) return htmlfill.render( @@ -316,7 +316,7 @@ ('clone_uri_tmpl', 'rhodecode_clone_uri_tmpl', 'unicode'), ] for setting, form_key, type_ in settings: - sett = RhodeCodeSetting.create_or_update(setting, + sett = Setting.create_or_update(setting, form_result[form_key], type_) Session().add(sett) @@ -333,7 +333,7 @@ return redirect(url('admin_settings_visual')) - defaults = RhodeCodeSetting.get_app_settings() + defaults = Setting.get_app_settings() defaults.update(self._get_hg_ui_settings()) return htmlfill.render( @@ -368,7 +368,7 @@ h.flash(_('Send email task created'), category='success') return redirect(url('admin_settings_email')) - defaults = RhodeCodeSetting.get_app_settings() + defaults = Setting.get_app_settings() defaults.update(self._get_hg_ui_settings()) import kallithea @@ -394,10 +394,10 @@ try: if ui_value and ui_key: - RhodeCodeUi.create_or_update_hook(ui_key, ui_value) + Ui.create_or_update_hook(ui_key, ui_value) h.flash(_('Added new hook'), category='success') elif hook_id: - RhodeCodeUi.delete(hook_id) + Ui.delete(hook_id) Session().commit() # check for edits @@ -405,7 +405,7 @@ _d = request.POST.dict_of_lists() for k, v in zip(_d.get('hook_ui_key', []), _d.get('hook_ui_value_new', [])): - RhodeCodeUi.create_or_update_hook(k, v) + Ui.create_or_update_hook(k, v) update = True if update: @@ -418,11 +418,11 @@ return redirect(url('admin_settings_hooks')) - defaults = RhodeCodeSetting.get_app_settings() + defaults = Setting.get_app_settings() defaults.update(self._get_hg_ui_settings()) - c.hooks = RhodeCodeUi.get_builtin_hooks() - c.custom_hooks = RhodeCodeUi.get_custom_hooks() + c.hooks = Ui.get_builtin_hooks() + c.custom_hooks = Ui.get_custom_hooks() return htmlfill.render( render('admin/settings/settings.html'), @@ -442,7 +442,7 @@ h.flash(_('Whoosh reindex task scheduled'), category='success') return redirect(url('admin_settings_search')) - defaults = RhodeCodeSetting.get_app_settings() + defaults = Setting.get_app_settings() defaults.update(self._get_hg_ui_settings()) return htmlfill.render( @@ -457,13 +457,13 @@ # url('admin_settings_system') c.active = 'system' - defaults = RhodeCodeSetting.get_app_settings() + defaults = Setting.get_app_settings() defaults.update(self._get_hg_ui_settings()) import kallithea c.rhodecode_ini = kallithea.CONFIG c.rhodecode_update_url = defaults.get('rhodecode_update_url') - server_info = RhodeCodeSetting.get_server_info() + server_info = Setting.get_server_info() for key, val in server_info.iteritems(): setattr(c, key, val) @@ -482,7 +482,7 @@ from kallithea.lib.verlib import NormalizedVersion from kallithea import __version__ - defaults = RhodeCodeSetting.get_app_settings() + defaults = Setting.get_app_settings() defaults.update(self._get_hg_ui_settings()) _update_url = defaults.get('rhodecode_update_url', '')
--- a/kallithea/controllers/api/api.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/controllers/api/api.py Wed Jul 02 19:05:36 2014 -0400 @@ -45,7 +45,7 @@ from kallithea.model.user_group import UserGroupModel from kallithea.model.gist import GistModel from kallithea.model.db import ( - Repository, RhodeCodeSetting, UserIpMap, Permission, User, Gist, + Repository, Setting, UserIpMap, Permission, User, Gist, RepoGroup) from kallithea.lib.compat import json from kallithea.lib.exceptions import ( @@ -528,7 +528,7 @@ } error : null """ - return RhodeCodeSetting.get_server_info() + return Setting.get_server_info() def get_user(self, apiuser, userid=Optional(OAttr('apiuser'))): """ @@ -1464,7 +1464,7 @@ if RepoModel().get_by_repo_name(repo_name): raise JSONRPCError("repo `%s` already exist" % repo_name) - defs = RhodeCodeSetting.get_default_repo_settings(strip_prefix=True) + defs = Setting.get_default_repo_settings(strip_prefix=True) if isinstance(private, Optional): private = defs.get('repo_private') or Optional.extract(private) if isinstance(repo_type, Optional):
--- a/kallithea/controllers/forks.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/controllers/forks.py Wed Jul 02 19:05:36 2014 -0400 @@ -40,7 +40,7 @@ NotAnonymous, HasRepoPermissionAny, HasPermissionAnyDecorator from kallithea.lib.base import BaseRepoController, render from kallithea.model.db import Repository, RepoGroup, UserFollowing, User,\ - RhodeCodeUi + Ui from kallithea.model.repo import RepoModel from kallithea.model.forms import RepoForkForm from kallithea.model.scm import ScmModel, RepoGroupList @@ -62,7 +62,7 @@ c.repo_groups_choices = map(lambda k: unicode(k[0]), c.repo_groups) choices, c.landing_revs = ScmModel().get_repo_landing_revs() c.landing_revs_choices = choices - c.can_update = RhodeCodeUi.get_by_key(RhodeCodeUi.HOOK_UPDATE).ui_active + c.can_update = Ui.get_by_key(Ui.HOOK_UPDATE).ui_active def __load_data(self, repo_name=None): """ @@ -167,7 +167,7 @@ form_result = _form.to_python(dict(request.POST)) # an approximation that is better than nothing - if not RhodeCodeUi.get_by_key(RhodeCodeUi.HOOK_UPDATE).ui_active: + if not Ui.get_by_key(Ui.HOOK_UPDATE).ui_active: form_result['update_after_clone'] = False # create fork is done sometimes async on celery, db transaction
--- a/kallithea/controllers/login.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/controllers/login.py Wed Jul 02 19:05:36 2014 -0400 @@ -40,7 +40,7 @@ from kallithea.lib.auth_modules import importplugin from kallithea.lib.base import BaseController, render from kallithea.lib.exceptions import UserCreationError -from kallithea.model.db import User, RhodeCodeSetting +from kallithea.model.db import User, Setting from kallithea.model.forms import LoginForm, RegisterForm, PasswordResetForm from kallithea.model.user import UserModel from kallithea.model.meta import Session @@ -141,7 +141,7 @@ h.flash(e, 'error') # check if we use container plugin, and try to login using it. - auth_plugins = RhodeCodeSetting.get_auth_plugins() + auth_plugins = Setting.get_auth_plugins() if any((importplugin(name).is_container_auth for name in auth_plugins)): from kallithea.lib import auth_modules try: @@ -163,7 +163,7 @@ c.auto_active = 'hg.register.auto_activate' in User.get_default_user()\ .AuthUser.permissions['global'] - settings = RhodeCodeSetting.get_app_settings() + settings = Setting.get_app_settings() captcha_private_key = settings.get('rhodecode_captcha_private_key') c.captcha_active = bool(captcha_private_key) c.captcha_public_key = settings.get('rhodecode_captcha_public_key') @@ -210,7 +210,7 @@ return render('/register.html') def password_reset(self): - settings = RhodeCodeSetting.get_app_settings() + settings = Setting.get_app_settings() captcha_private_key = settings.get('rhodecode_captcha_private_key') c.captcha_active = bool(captcha_private_key) c.captcha_public_key = settings.get('rhodecode_captcha_public_key')
--- a/kallithea/lib/auth_modules/__init__.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/lib/auth_modules/__init__.py Wed Jul 02 19:05:36 2014 -0400 @@ -23,7 +23,7 @@ from kallithea.lib.compat import formatted_json, hybrid_property from kallithea.lib.auth import PasswordGenerator from kallithea.model.user import UserModel -from kallithea.model.db import RhodeCodeSetting, User, UserGroup +from kallithea.model.db import Setting, User, UserGroup from kallithea.model.meta import Session from kallithea.model.user_group import UserGroupModel @@ -358,7 +358,7 @@ :returns: None if auth failed, plugin_user dict if auth is correct """ - auth_plugins = RhodeCodeSetting.get_auth_plugins() + auth_plugins = Setting.get_auth_plugins() log.debug('Authentication against %s plugins' % (auth_plugins,)) for module in auth_plugins: try: @@ -372,7 +372,7 @@ plugin_settings = {} for v in plugin.plugin_settings(): conf_key = "auth_%s_%s" % (plugin_name, v["name"]) - setting = RhodeCodeSetting.get_by_name(conf_key) + setting = Setting.get_by_name(conf_key) plugin_settings[v["name"]] = setting.app_settings_value if setting else None log.debug('Plugin settings \n%s' % formatted_json(plugin_settings))
--- a/kallithea/lib/base.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/lib/base.py Wed Jul 02 19:05:36 2014 -0400 @@ -49,7 +49,7 @@ from kallithea.lib.exceptions import UserCreationError from kallithea.model import meta -from kallithea.model.db import Repository, RhodeCodeUi, User, RhodeCodeSetting +from kallithea.model.db import Repository, Ui, User, Setting from kallithea.model.notification import NotificationModel from kallithea.model.scm import ScmModel from kallithea.model.meta import Session @@ -215,7 +215,7 @@ """ org_proto = environ['wsgi._org_proto'] #check if we have SSL required ! if not it's a bad request ! - require_ssl = str2bool(RhodeCodeUi.get_by_key('push_ssl').ui_value) + require_ssl = str2bool(Ui.get_by_key('push_ssl').ui_value) if require_ssl and org_proto == 'http': log.debug('proto is %s and SSL is required BAD REQUEST !' % org_proto) @@ -283,7 +283,7 @@ __before__ is called before controller methods and after __call__ """ c.kallithea_version = __version__ - rc_config = RhodeCodeSetting.get_app_settings() + rc_config = Setting.get_app_settings() # Visual options c.visual = AttributeDict({})
--- a/kallithea/lib/celerylib/tasks.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/lib/celerylib/tasks.py Wed Jul 02 19:05:36 2014 -0400 @@ -305,7 +305,7 @@ def create_repo(form_data, cur_user): from kallithea.model.repo import RepoModel from kallithea.model.user import UserModel - from kallithea.model.db import RhodeCodeSetting + from kallithea.model.db import Setting log = get_logger(create_repo) DBS = get_session() @@ -327,7 +327,7 @@ state = form_data.get('repo_state', Repository.STATE_PENDING) # repo creation defaults, private and repo_type are filled in form - defs = RhodeCodeSetting.get_default_repo_settings(strip_prefix=True) + defs = Setting.get_default_repo_settings(strip_prefix=True) enable_statistics = defs.get('repo_enable_statistics') enable_locking = defs.get('repo_enable_locking') enable_downloads = defs.get('repo_enable_downloads')
--- a/kallithea/lib/db_manage.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/lib/db_manage.py Wed Jul 02 19:05:36 2014 -0400 @@ -37,8 +37,8 @@ from kallithea.model.user import UserModel from kallithea.lib.utils import ask_ok from kallithea.model import init_model -from kallithea.model.db import User, Permission, RhodeCodeUi, \ - RhodeCodeSetting, UserToPerm, DbMigrateVersion, RepoGroup, \ +from kallithea.model.db import User, Permission, Ui, \ + Setting, UserToPerm, DbMigrateVersion, RepoGroup, \ UserRepoGroupToPerm, CacheInvalidation, UserGroup, Repository from sqlalchemy.engine import create_engine @@ -185,8 +185,8 @@ Fixes a old rhodecode version path into new one without a '*' """ - paths = self.sa.query(RhodeCodeUi)\ - .filter(RhodeCodeUi.ui_key == '/')\ + paths = self.sa.query(Ui)\ + .filter(Ui.ui_key == '/')\ .scalar() paths.ui_value = paths.ui_value.replace('*', '') @@ -223,7 +223,7 @@ Fixes rhodecode settings adds ga_code key for google analytics """ - hgsettings3 = RhodeCodeSetting('ga_code', '') + hgsettings3 = Setting('ga_code', '') try: self.sa.add(hgsettings3) @@ -291,52 +291,52 @@ """ #HOOKS - hooks1_key = RhodeCodeUi.HOOK_UPDATE - hooks1_ = self.sa.query(RhodeCodeUi)\ - .filter(RhodeCodeUi.ui_key == hooks1_key).scalar() + hooks1_key = Ui.HOOK_UPDATE + hooks1_ = self.sa.query(Ui)\ + .filter(Ui.ui_key == hooks1_key).scalar() - hooks1 = RhodeCodeUi() if hooks1_ is None else hooks1_ + hooks1 = Ui() if hooks1_ is None else hooks1_ hooks1.ui_section = 'hooks' hooks1.ui_key = hooks1_key hooks1.ui_value = 'hg update >&2' hooks1.ui_active = False self.sa.add(hooks1) - hooks2_key = RhodeCodeUi.HOOK_REPO_SIZE - hooks2_ = self.sa.query(RhodeCodeUi)\ - .filter(RhodeCodeUi.ui_key == hooks2_key).scalar() - hooks2 = RhodeCodeUi() if hooks2_ is None else hooks2_ + hooks2_key = Ui.HOOK_REPO_SIZE + hooks2_ = self.sa.query(Ui)\ + .filter(Ui.ui_key == hooks2_key).scalar() + hooks2 = Ui() if hooks2_ is None else hooks2_ hooks2.ui_section = 'hooks' hooks2.ui_key = hooks2_key hooks2.ui_value = 'python:kallithea.lib.hooks.repo_size' self.sa.add(hooks2) - hooks3 = RhodeCodeUi() + hooks3 = Ui() hooks3.ui_section = 'hooks' - hooks3.ui_key = RhodeCodeUi.HOOK_PUSH + hooks3.ui_key = Ui.HOOK_PUSH hooks3.ui_value = 'python:kallithea.lib.hooks.log_push_action' self.sa.add(hooks3) - hooks4 = RhodeCodeUi() + hooks4 = Ui() hooks4.ui_section = 'hooks' - hooks4.ui_key = RhodeCodeUi.HOOK_PRE_PUSH + hooks4.ui_key = Ui.HOOK_PRE_PUSH hooks4.ui_value = 'python:kallithea.lib.hooks.pre_push' self.sa.add(hooks4) - hooks5 = RhodeCodeUi() + hooks5 = Ui() hooks5.ui_section = 'hooks' - hooks5.ui_key = RhodeCodeUi.HOOK_PULL + hooks5.ui_key = Ui.HOOK_PULL hooks5.ui_value = 'python:kallithea.lib.hooks.log_pull_action' self.sa.add(hooks5) - hooks6 = RhodeCodeUi() + hooks6 = Ui() hooks6.ui_section = 'hooks' - hooks6.ui_key = RhodeCodeUi.HOOK_PRE_PULL + hooks6.ui_key = Ui.HOOK_PRE_PULL hooks6.ui_value = 'python:kallithea.lib.hooks.pre_pull' self.sa.add(hooks6) # enable largefiles - largefiles = RhodeCodeUi() + largefiles = Ui() largefiles.ui_section = 'extensions' largefiles.ui_key = 'largefiles' largefiles.ui_value = '' @@ -344,7 +344,7 @@ # set default largefiles cache dir, defaults to # /repo location/.cache/largefiles - largefiles = RhodeCodeUi() + largefiles = Ui() largefiles.ui_section = 'largefiles' largefiles.ui_key = 'usercache' largefiles.ui_value = os.path.join(repo_store_path, '.cache', @@ -352,7 +352,7 @@ self.sa.add(largefiles) # enable hgsubversion disabled by default - hgsubversion = RhodeCodeUi() + hgsubversion = Ui() hgsubversion.ui_section = 'extensions' hgsubversion.ui_key = 'hgsubversion' hgsubversion.ui_value = '' @@ -360,7 +360,7 @@ self.sa.add(hgsubversion) # enable hggit disabled by default - hggit = RhodeCodeUi() + hggit = Ui() hggit.ui_section = 'extensions' hggit.ui_key = 'hggit' hggit.ui_value = '' @@ -376,10 +376,10 @@ for k, v, t in [('auth_plugins', 'kallithea.lib.auth_modules.auth_rhodecode', 'list'), ('auth_rhodecode_enabled', 'True', 'bool')]: - if skip_existing and RhodeCodeSetting.get_by_name(k) != None: + if skip_existing and Setting.get_by_name(k) != None: log.debug('Skipping option %s' % k) continue - setting = RhodeCodeSetting(k, v, t) + setting = Setting(k, v, t) self.sa.add(setting) def create_default_options(self, skip_existing=False): @@ -392,10 +392,10 @@ ('default_repo_private', False, 'bool'), ('default_repo_type', 'hg', 'unicode')]: - if skip_existing and RhodeCodeSetting.get_by_name(k) is not None: + if skip_existing and Setting.get_by_name(k) is not None: log.debug('Skipping option %s' % k) continue - setting = RhodeCodeSetting(k, v, t) + setting = Setting(k, v, t) self.sa.add(setting) def fixup_groups(self): @@ -506,7 +506,7 @@ #('phases', 'publish', 'false') ] for section, key, value in ui_config: - ui_conf = RhodeCodeUi() + ui_conf = Ui() setattr(ui_conf, 'ui_section', section) setattr(ui_conf, 'ui_key', key) setattr(ui_conf, 'ui_value', value) @@ -525,10 +525,10 @@ ('use_gravatar', True, 'bool'), ('gravatar_url', User.DEFAULT_GRAVATAR_URL, 'unicode'), ('clone_uri_tmpl', Repository.DEFAULT_CLONE_URI, 'unicode'), - ('update_url', RhodeCodeSetting.DEFAULT_UPDATE_URL, 'unicode'), + ('update_url', Setting.DEFAULT_UPDATE_URL, 'unicode'), ] for key, val, type_ in settings: - sett = RhodeCodeSetting(key, val, type_) + sett = Setting(key, val, type_) self.sa.add(sett) self.create_auth_plugin_options()
--- a/kallithea/lib/dbmigrate/schema/db_1_2_0.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/lib/dbmigrate/schema/db_1_2_0.py Wed Jul 02 19:05:36 2014 -0400 @@ -139,7 +139,7 @@ Session.commit() -class RhodeCodeSetting(Base, BaseModel): +class Setting(Base, BaseModel): __tablename__ = 'rhodecode_settings' __table_args__ = (UniqueConstraint('app_settings_name'), {'extend_existing':True}) app_settings_id = Column("app_settings_id", Integer(), nullable=False, unique=True, default=None, primary_key=True) @@ -210,7 +210,7 @@ return fd -class RhodeCodeUi(Base, BaseModel): +class Ui(Base, BaseModel): __tablename__ = 'rhodecode_ui' __table_args__ = (UniqueConstraint('ui_key'), {'extend_existing':True}) @@ -539,7 +539,7 @@ :param cls: """ - q = Session.query(RhodeCodeUi).filter(RhodeCodeUi.ui_key == + q = Session.query(Ui).filter(Ui.ui_key == cls.url_sep()) q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -575,7 +575,7 @@ Returns base full path for that repository means where it actually exists on a filesystem """ - q = Session.query(RhodeCodeUi).filter(RhodeCodeUi.ui_key == + q = Session.query(Ui).filter(Ui.ui_key == Repository.url_sep()) q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -613,7 +613,7 @@ baseui._tcfg = config.config() - ret = RhodeCodeUi.query()\ + ret = Ui.query()\ .options(FromCache("sql_cache_short", "repository_repo_ui")).all() hg_ui = ret
--- a/kallithea/lib/dbmigrate/schema/db_1_3_0.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/lib/dbmigrate/schema/db_1_3_0.py Wed Jul 02 19:05:36 2014 -0400 @@ -154,7 +154,7 @@ return safe_str(self.__unicode__()) return '<DB:%s>' % (self.__class__.__name__) -class RhodeCodeSetting(Base, BaseModel): +class Setting(Base, BaseModel): __tablename__ = 'rhodecode_settings' __table_args__ = ( UniqueConstraint('app_settings_name'), @@ -229,7 +229,7 @@ return fd -class RhodeCodeUi(Base, BaseModel): +class Ui(Base, BaseModel): __tablename__ = 'rhodecode_ui' __table_args__ = ( UniqueConstraint('ui_key'), @@ -546,8 +546,8 @@ :param cls: """ - q = Session.query(RhodeCodeUi)\ - .filter(RhodeCodeUi.ui_key == cls.url_sep()) + q = Session.query(Ui)\ + .filter(Ui.ui_key == cls.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -582,7 +582,7 @@ Returns base full path for that repository means where it actually exists on a filesystem """ - q = Session.query(RhodeCodeUi).filter(RhodeCodeUi.ui_key == + q = Session.query(Ui).filter(Ui.ui_key == Repository.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -619,7 +619,7 @@ baseui._ucfg = config.config() baseui._tcfg = config.config() - ret = RhodeCodeUi.query()\ + ret = Ui.query()\ .options(FromCache("sql_cache_short", "repository_repo_ui")).all() hg_ui = ret
--- a/kallithea/lib/dbmigrate/schema/db_1_4_0.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/lib/dbmigrate/schema/db_1_4_0.py Wed Jul 02 19:05:36 2014 -0400 @@ -145,7 +145,7 @@ return '<DB:%s>' % (self.__class__.__name__) -class RhodeCodeSetting(Base, BaseModel): +class Setting(Base, BaseModel): __tablename__ = 'rhodecode_settings' __table_args__ = ( UniqueConstraint('app_settings_name'), @@ -227,7 +227,7 @@ return fd -class RhodeCodeUi(Base, BaseModel): +class Ui(Base, BaseModel): __tablename__ = 'rhodecode_ui' __table_args__ = ( UniqueConstraint('ui_key'), @@ -691,8 +691,8 @@ :param cls: """ - q = Session().query(RhodeCodeUi)\ - .filter(RhodeCodeUi.ui_key == cls.url_sep()) + q = Session().query(Ui)\ + .filter(Ui.ui_key == cls.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -741,7 +741,7 @@ Returns base full path for that repository means where it actually exists on a filesystem """ - q = Session().query(RhodeCodeUi).filter(RhodeCodeUi.ui_key == + q = Session().query(Ui).filter(Ui.ui_key == Repository.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value
--- a/kallithea/lib/dbmigrate/schema/db_1_5_0.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/lib/dbmigrate/schema/db_1_5_0.py Wed Jul 02 19:05:36 2014 -0400 @@ -144,7 +144,7 @@ return '<DB:%s>' % (self.__class__.__name__) -class RhodeCodeSetting(Base, BaseModel): +class Setting(Base, BaseModel): __tablename__ = 'rhodecode_settings' __table_args__ = ( UniqueConstraint('app_settings_name'), @@ -243,7 +243,7 @@ return fd -class RhodeCodeUi(Base, BaseModel): +class Ui(Base, BaseModel): __tablename__ = 'rhodecode_ui' __table_args__ = ( UniqueConstraint('ui_key'), @@ -710,8 +710,8 @@ :param cls: """ - q = Session().query(RhodeCodeUi)\ - .filter(RhodeCodeUi.ui_key == cls.url_sep()) + q = Session().query(Ui)\ + .filter(Ui.ui_key == cls.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -760,7 +760,7 @@ Returns base full path for that repository means where it actually exists on a filesystem """ - q = Session().query(RhodeCodeUi).filter(RhodeCodeUi.ui_key == + q = Session().query(Ui).filter(Ui.ui_key == Repository.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value
--- a/kallithea/lib/dbmigrate/schema/db_1_5_2.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/lib/dbmigrate/schema/db_1_5_2.py Wed Jul 02 19:05:36 2014 -0400 @@ -145,7 +145,7 @@ return '<DB:%s>' % (self.__class__.__name__) -class RhodeCodeSetting(Base, BaseModel): +class Setting(Base, BaseModel): __tablename__ = 'rhodecode_settings' __table_args__ = ( UniqueConstraint('app_settings_name'), @@ -244,7 +244,7 @@ return fd -class RhodeCodeUi(Base, BaseModel): +class Ui(Base, BaseModel): __tablename__ = 'rhodecode_ui' __table_args__ = ( UniqueConstraint('ui_key'), @@ -776,8 +776,8 @@ :param cls: """ - q = Session().query(RhodeCodeUi)\ - .filter(RhodeCodeUi.ui_key == cls.url_sep()) + q = Session().query(Ui)\ + .filter(Ui.ui_key == cls.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -826,7 +826,7 @@ Returns base full path for that repository means where it actually exists on a filesystem """ - q = Session().query(RhodeCodeUi).filter(RhodeCodeUi.ui_key == + q = Session().query(Ui).filter(Ui.ui_key == Repository.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value
--- a/kallithea/lib/dbmigrate/schema/db_1_6_0.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/lib/dbmigrate/schema/db_1_6_0.py Wed Jul 02 19:05:36 2014 -0400 @@ -145,7 +145,7 @@ return '<DB:%s>' % (self.__class__.__name__) -class RhodeCodeSetting(Base, BaseModel): +class Setting(Base, BaseModel): __tablename__ = 'rhodecode_settings' __table_args__ = ( UniqueConstraint('app_settings_name'), @@ -244,7 +244,7 @@ return fd -class RhodeCodeUi(Base, BaseModel): +class Ui(Base, BaseModel): __tablename__ = 'rhodecode_ui' __table_args__ = ( UniqueConstraint('ui_key'), @@ -845,8 +845,8 @@ :param cls: """ - q = Session().query(RhodeCodeUi)\ - .filter(RhodeCodeUi.ui_key == cls.url_sep()) + q = Session().query(Ui)\ + .filter(Ui.ui_key == cls.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -895,7 +895,7 @@ Returns base full path for that repository means where it actually exists on a filesystem """ - q = Session().query(RhodeCodeUi).filter(RhodeCodeUi.ui_key == + q = Session().query(Ui).filter(Ui.ui_key == Repository.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -974,7 +974,7 @@ locked_date=time_to_datetime(self.locked[1]) \ if self.locked[1] else None ) - rc_config = RhodeCodeSetting.get_app_settings() + rc_config = Setting.get_app_settings() repository_fields = str2bool(rc_config.get('rhodecode_repository_fields')) if repository_fields: for f in self.extra_fields:
--- a/kallithea/lib/dbmigrate/schema/db_1_7_0.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/lib/dbmigrate/schema/db_1_7_0.py Wed Jul 02 19:05:36 2014 -0400 @@ -150,7 +150,7 @@ return '<DB:%s>' % (self.__class__.__name__) -class RhodeCodeSetting(Base, BaseModel): +class Setting(Base, BaseModel): __tablename__ = 'rhodecode_settings' __table_args__ = ( UniqueConstraint('app_settings_name'), @@ -249,7 +249,7 @@ return fd -class RhodeCodeUi(Base, BaseModel): +class Ui(Base, BaseModel): __tablename__ = 'rhodecode_ui' __table_args__ = ( UniqueConstraint('ui_key'), @@ -874,8 +874,8 @@ :param cls: """ - q = Session().query(RhodeCodeUi)\ - .filter(RhodeCodeUi.ui_key == cls.url_sep()) + q = Session().query(Ui)\ + .filter(Ui.ui_key == cls.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -924,7 +924,7 @@ Returns base full path for that repository means where it actually exists on a filesystem """ - q = Session().query(RhodeCodeUi).filter(RhodeCodeUi.ui_key == + q = Session().query(Ui).filter(Ui.ui_key == Repository.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -1003,7 +1003,7 @@ locked_date=time_to_datetime(self.locked[1]) \ if self.locked[1] else None ) - rc_config = RhodeCodeSetting.get_app_settings() + rc_config = Setting.get_app_settings() repository_fields = str2bool(rc_config.get('rhodecode_repository_fields')) if repository_fields: for f in self.extra_fields: @@ -2176,8 +2176,8 @@ :param cls: """ from kallithea.model.gist import GIST_STORE_LOC - q = Session().query(RhodeCodeUi)\ - .filter(RhodeCodeUi.ui_key == URL_SEP) + q = Session().query(Ui)\ + .filter(Ui.ui_key == URL_SEP) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return os.path.join(q.one().ui_value, GIST_STORE_LOC)
--- a/kallithea/lib/dbmigrate/schema/db_1_8_0.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/lib/dbmigrate/schema/db_1_8_0.py Wed Jul 02 19:05:36 2014 -0400 @@ -150,7 +150,7 @@ return '<DB:%s>' % (self.__class__.__name__) -class RhodeCodeSetting(Base, BaseModel): +class Setting(Base, BaseModel): __tablename__ = 'rhodecode_settings' __table_args__ = ( UniqueConstraint('app_settings_name'), @@ -267,7 +267,7 @@ return info -class RhodeCodeUi(Base, BaseModel): +class Ui(Base, BaseModel): __tablename__ = 'rhodecode_ui' __table_args__ = ( UniqueConstraint('ui_key'), @@ -904,8 +904,8 @@ :param cls: """ - q = Session().query(RhodeCodeUi)\ - .filter(RhodeCodeUi.ui_key == cls.url_sep()) + q = Session().query(Ui)\ + .filter(Ui.ui_key == cls.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -954,7 +954,7 @@ Returns base full path for that repository means where it actually exists on a filesystem """ - q = Session().query(RhodeCodeUi).filter(RhodeCodeUi.ui_key == + q = Session().query(Ui).filter(Ui.ui_key == Repository.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -1033,7 +1033,7 @@ locked_date=time_to_datetime(self.locked[1]) \ if self.locked[1] else None ) - rc_config = RhodeCodeSetting.get_app_settings() + rc_config = Setting.get_app_settings() repository_fields = str2bool(rc_config.get('rhodecode_repository_fields')) if repository_fields: for f in self.extra_fields: @@ -2223,8 +2223,8 @@ :param cls: """ from kallithea.model.gist import GIST_STORE_LOC - q = Session().query(RhodeCodeUi)\ - .filter(RhodeCodeUi.ui_key == URL_SEP) + q = Session().query(Ui)\ + .filter(Ui.ui_key == URL_SEP) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return os.path.join(q.one().ui_value, GIST_STORE_LOC)
--- a/kallithea/lib/dbmigrate/schema/db_2_0_0.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/lib/dbmigrate/schema/db_2_0_0.py Wed Jul 02 19:05:36 2014 -0400 @@ -151,7 +151,7 @@ return '<DB:%s>' % (self.__class__.__name__) -class RhodeCodeSetting(Base, BaseModel): +class Setting(Base, BaseModel): SETTINGS_TYPES = { 'str': safe_str, 'int': safe_int, @@ -314,7 +314,7 @@ return info -class RhodeCodeUi(Base, BaseModel): +class Ui(Base, BaseModel): __tablename__ = 'rhodecode_ui' __table_args__ = ( UniqueConstraint('ui_key'), @@ -961,8 +961,8 @@ :param cls: """ - q = Session().query(RhodeCodeUi)\ - .filter(RhodeCodeUi.ui_key == cls.url_sep()) + q = Session().query(Ui)\ + .filter(Ui.ui_key == cls.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -1011,7 +1011,7 @@ Returns base full path for that repository means where it actually exists on a filesystem """ - q = Session().query(RhodeCodeUi).filter(RhodeCodeUi.ui_key == + q = Session().query(Ui).filter(Ui.ui_key == Repository.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -1090,7 +1090,7 @@ locked_date=time_to_datetime(self.locked[1]) \ if self.locked[1] else None ) - rc_config = RhodeCodeSetting.get_app_settings() + rc_config = Setting.get_app_settings() repository_fields = str2bool(rc_config.get('rhodecode_repository_fields')) if repository_fields: for f in self.extra_fields: @@ -2283,8 +2283,8 @@ :param cls: """ from kallithea.model.gist import GIST_STORE_LOC - q = Session().query(RhodeCodeUi)\ - .filter(RhodeCodeUi.ui_key == URL_SEP) + q = Session().query(Ui)\ + .filter(Ui.ui_key == URL_SEP) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return os.path.join(q.one().ui_value, GIST_STORE_LOC)
--- a/kallithea/lib/dbmigrate/schema/db_2_0_1.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/lib/dbmigrate/schema/db_2_0_1.py Wed Jul 02 19:05:36 2014 -0400 @@ -154,7 +154,7 @@ return '<DB:%s>' % (self.__class__.__name__) -class RhodeCodeSetting(Base, BaseModel): +class Setting(Base, BaseModel): SETTINGS_TYPES = { 'str': safe_str, 'int': safe_int, @@ -317,7 +317,7 @@ return info -class RhodeCodeUi(Base, BaseModel): +class Ui(Base, BaseModel): __tablename__ = 'rhodecode_ui' __table_args__ = ( UniqueConstraint('ui_key'), @@ -960,8 +960,8 @@ :param cls: """ - q = Session().query(RhodeCodeUi)\ - .filter(RhodeCodeUi.ui_key == cls.url_sep()) + q = Session().query(Ui)\ + .filter(Ui.ui_key == cls.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -1010,7 +1010,7 @@ Returns base full path for that repository means where it actually exists on a filesystem """ - q = Session().query(RhodeCodeUi).filter(RhodeCodeUi.ui_key == + q = Session().query(Ui).filter(Ui.ui_key == Repository.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -1089,7 +1089,7 @@ locked_date=time_to_datetime(self.locked[1]) \ if self.locked[1] else None ) - rc_config = RhodeCodeSetting.get_app_settings() + rc_config = Setting.get_app_settings() repository_fields = str2bool(rc_config.get('rhodecode_repository_fields')) if repository_fields: for f in self.extra_fields: @@ -2284,8 +2284,8 @@ :param cls: """ from kallithea.model.gist import GIST_STORE_LOC - q = Session().query(RhodeCodeUi)\ - .filter(RhodeCodeUi.ui_key == URL_SEP) + q = Session().query(Ui)\ + .filter(Ui.ui_key == URL_SEP) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return os.path.join(q.one().ui_value, GIST_STORE_LOC)
--- a/kallithea/lib/dbmigrate/schema/db_2_0_2.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/lib/dbmigrate/schema/db_2_0_2.py Wed Jul 02 19:05:36 2014 -0400 @@ -154,7 +154,7 @@ return '<DB:%s>' % (self.__class__.__name__) -class RhodeCodeSetting(Base, BaseModel): +class Setting(Base, BaseModel): SETTINGS_TYPES = { 'str': safe_str, 'int': safe_int, @@ -317,7 +317,7 @@ return info -class RhodeCodeUi(Base, BaseModel): +class Ui(Base, BaseModel): __tablename__ = 'rhodecode_ui' __table_args__ = ( UniqueConstraint('ui_key'), @@ -977,8 +977,8 @@ :param cls: """ - q = Session().query(RhodeCodeUi)\ - .filter(RhodeCodeUi.ui_key == cls.url_sep()) + q = Session().query(Ui)\ + .filter(Ui.ui_key == cls.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -1027,7 +1027,7 @@ Returns base full path for that repository means where it actually exists on a filesystem """ - q = Session().query(RhodeCodeUi).filter(RhodeCodeUi.ui_key == + q = Session().query(Ui).filter(Ui.ui_key == Repository.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -1106,7 +1106,7 @@ locked_date=time_to_datetime(self.locked[1]) \ if self.locked[1] else None ) - rc_config = RhodeCodeSetting.get_app_settings() + rc_config = Setting.get_app_settings() repository_fields = str2bool(rc_config.get('rhodecode_repository_fields')) if repository_fields: for f in self.extra_fields: @@ -2305,8 +2305,8 @@ :param cls: """ from kallithea.model.gist import GIST_STORE_LOC - q = Session().query(RhodeCodeUi)\ - .filter(RhodeCodeUi.ui_key == URL_SEP) + q = Session().query(Ui)\ + .filter(Ui.ui_key == URL_SEP) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return os.path.join(q.one().ui_value, GIST_STORE_LOC)
--- a/kallithea/lib/dbmigrate/schema/db_2_1_0.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/lib/dbmigrate/schema/db_2_1_0.py Wed Jul 02 19:05:36 2014 -0400 @@ -154,7 +154,7 @@ return '<DB:%s>' % (self.__class__.__name__) -class RhodeCodeSetting(Base, BaseModel): +class Setting(Base, BaseModel): __tablename__ = 'rhodecode_settings' __table_args__ = ( UniqueConstraint('app_settings_name'), @@ -320,7 +320,7 @@ return info -class RhodeCodeUi(Base, BaseModel): +class Ui(Base, BaseModel): __tablename__ = 'rhodecode_ui' __table_args__ = ( UniqueConstraint('ui_key'), @@ -1016,8 +1016,8 @@ :param cls: """ - q = Session().query(RhodeCodeUi)\ - .filter(RhodeCodeUi.ui_key == cls.url_sep()) + q = Session().query(Ui)\ + .filter(Ui.ui_key == cls.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -1066,7 +1066,7 @@ Returns base full path for that repository means where it actually exists on a filesystem """ - q = Session().query(RhodeCodeUi).filter(RhodeCodeUi.ui_key == + q = Session().query(Ui).filter(Ui.ui_key == Repository.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -1145,7 +1145,7 @@ locked_date=time_to_datetime(self.locked[1]) \ if self.locked[1] else None ) - rc_config = RhodeCodeSetting.get_app_settings() + rc_config = Setting.get_app_settings() repository_fields = str2bool(rc_config.get('rhodecode_repository_fields')) if repository_fields: for f in self.extra_fields: @@ -2344,8 +2344,8 @@ :param cls: """ from kallithea.model.gist import GIST_STORE_LOC - q = Session().query(RhodeCodeUi)\ - .filter(RhodeCodeUi.ui_key == URL_SEP) + q = Session().query(Ui)\ + .filter(Ui.ui_key == URL_SEP) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return os.path.join(q.one().ui_value, GIST_STORE_LOC)
--- a/kallithea/lib/dbmigrate/schema/db_2_2_0.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/lib/dbmigrate/schema/db_2_2_0.py Wed Jul 02 19:05:36 2014 -0400 @@ -155,7 +155,7 @@ return '<DB:%s>' % (self.__class__.__name__) -class RhodeCodeSetting(Base, BaseModel): +class Setting(Base, BaseModel): __tablename__ = 'rhodecode_settings' __table_args__ = ( UniqueConstraint('app_settings_name'), @@ -321,7 +321,7 @@ return info -class RhodeCodeUi(Base, BaseModel): +class Ui(Base, BaseModel): __tablename__ = 'rhodecode_ui' __table_args__ = ( UniqueConstraint('ui_key'), @@ -1056,8 +1056,8 @@ :param cls: """ - q = Session().query(RhodeCodeUi)\ - .filter(RhodeCodeUi.ui_key == cls.url_sep()) + q = Session().query(Ui)\ + .filter(Ui.ui_key == cls.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -1106,7 +1106,7 @@ Returns base full path for that repository means where it actually exists on a filesystem """ - q = Session().query(RhodeCodeUi).filter(RhodeCodeUi.ui_key == + q = Session().query(Ui).filter(Ui.ui_key == Repository.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -1185,7 +1185,7 @@ locked_date=time_to_datetime(self.locked[1]) \ if self.locked[1] else None ) - rc_config = RhodeCodeSetting.get_app_settings() + rc_config = Setting.get_app_settings() repository_fields = str2bool(rc_config.get('rhodecode_repository_fields')) if repository_fields: for f in self.extra_fields: @@ -2401,8 +2401,8 @@ :param cls: """ from kallithea.model.gist import GIST_STORE_LOC - q = Session().query(RhodeCodeUi)\ - .filter(RhodeCodeUi.ui_key == URL_SEP) + q = Session().query(Ui)\ + .filter(Ui.ui_key == URL_SEP) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return os.path.join(q.one().ui_value, GIST_STORE_LOC)
--- a/kallithea/lib/dbmigrate/schema/db_2_2_3.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/lib/dbmigrate/schema/db_2_2_3.py Wed Jul 02 19:05:36 2014 -0400 @@ -155,7 +155,7 @@ return '<DB:%s>' % (self.__class__.__name__) -class RhodeCodeSetting(Base, BaseModel): +class Setting(Base, BaseModel): __tablename__ = 'rhodecode_settings' __table_args__ = ( UniqueConstraint('app_settings_name'), @@ -321,7 +321,7 @@ return info -class RhodeCodeUi(Base, BaseModel): +class Ui(Base, BaseModel): __tablename__ = 'rhodecode_ui' __table_args__ = ( UniqueConstraint('ui_key'), @@ -1076,8 +1076,8 @@ :param cls: """ - q = Session().query(RhodeCodeUi)\ - .filter(RhodeCodeUi.ui_key == cls.url_sep()) + q = Session().query(Ui)\ + .filter(Ui.ui_key == cls.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -1126,7 +1126,7 @@ Returns base full path for that repository means where it actually exists on a filesystem """ - q = Session().query(RhodeCodeUi).filter(RhodeCodeUi.ui_key == + q = Session().query(Ui).filter(Ui.ui_key == Repository.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -1205,7 +1205,7 @@ locked_date=time_to_datetime(self.locked[1]) \ if self.locked[1] else None ) - rc_config = RhodeCodeSetting.get_app_settings() + rc_config = Setting.get_app_settings() repository_fields = str2bool(rc_config.get('rhodecode_repository_fields')) if repository_fields: for f in self.extra_fields: @@ -2447,8 +2447,8 @@ :param cls: """ from kallithea.model.gist import GIST_STORE_LOC - q = Session().query(RhodeCodeUi)\ - .filter(RhodeCodeUi.ui_key == URL_SEP) + q = Session().query(Ui)\ + .filter(Ui.ui_key == URL_SEP) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return os.path.join(q.one().ui_value, GIST_STORE_LOC)
--- a/kallithea/lib/dbmigrate/versions/001_initial_release.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/lib/dbmigrate/versions/001_initial_release.py Wed Jul 02 19:05:36 2014 -0400 @@ -14,7 +14,7 @@ log = logging.getLogger(__name__) -class RhodeCodeSetting(Base): +class Setting(Base): __tablename__ = 'rhodecode_settings' __table_args__ = (UniqueConstraint('app_settings_name'), {'useexisting':True}) app_settings_id = Column("app_settings_id", Integer(), nullable=False, unique=True, default=None, primary_key=True) @@ -26,10 +26,10 @@ self.app_settings_value = v def __repr__(self): - return "<RhodeCodeSetting('%s:%s')>" % (self.app_settings_name, + return "<Setting('%s:%s')>" % (self.app_settings_name, self.app_settings_value) -class RhodeCodeUi(Base): +class Ui(Base): __tablename__ = 'rhodecode_ui' __table_args__ = {'useexisting':True} ui_id = Column("ui_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
--- a/kallithea/lib/dbmigrate/versions/008_version_1_5_0.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/lib/dbmigrate/versions/008_version_1_5_0.py Wed Jul 02 19:05:36 2014 -0400 @@ -119,10 +119,10 @@ ('default_repo_private', False), ('default_repo_type', 'hg')]: - if skip_existing and models.RhodeCodeSetting.get_by_name(k) is not None: + if skip_existing and models.Setting.get_by_name(k) is not None: log.debug('Skipping option %s' % k) continue - setting = models.RhodeCodeSetting(k, v) + setting = models.Setting(k, v) _SESSION().add(setting) _SESSION().commit()
--- a/kallithea/lib/dbmigrate/versions/015_version_1_8_0.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/lib/dbmigrate/versions/015_version_1_8_0.py Wed Jul 02 19:05:36 2014 -0400 @@ -24,7 +24,7 @@ """ _reset_base(migrate_engine) from kallithea.lib.dbmigrate.schema import db_1_8_0 - tbl = db_1_8_0.RhodeCodeSetting.__table__ + tbl = db_1_8_0.Setting.__table__ app_settings_type = Column("app_settings_type", String(255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) @@ -64,10 +64,10 @@ ] for name, default, type_ in settings: - setting = models.RhodeCodeSetting.get_by_name(name) + setting = models.Setting.get_by_name(name) if not setting: # if we don't have this option create it - setting = models.RhodeCodeSetting(name, default, type_) + setting = models.Setting(name, default, type_) # fix certain key to new defaults if name in ['title', 'show_public_icon']:
--- a/kallithea/lib/dbmigrate/versions/018_version_2_0_0.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/lib/dbmigrate/versions/018_version_2_0_0.py Wed Jul 02 19:05:36 2014 -0400 @@ -40,7 +40,7 @@ plugins = 'kallithea.lib.auth_modules.auth_rhodecode' opts = [] ldap_enabled = str2bool(getattr( - models.RhodeCodeSetting.get_by_name('ldap_active'), + models.Setting.get_by_name('ldap_active'), 'app_settings_value', False)) if ldap_enabled: plugins += ',kallithea.lib.auth_modules.auth_ldap' @@ -50,10 +50,10 @@ opts.append(('auth_rhodecode_enabled', 'True', 'bool')) for name, default, type_ in opts: - setting = models.RhodeCodeSetting.get_by_name(name) + setting = models.Setting.get_by_name(name) if not setting: # if we don't have this option create it - setting = models.RhodeCodeSetting(name, default, type_) + setting = models.Setting(name, default, type_) _SESSION().add(setting) _SESSION().commit() @@ -67,12 +67,12 @@ ('ldap_attr_login', '', 'unicode'), ('ldap_attr_firstname', '', 'unicode'), ('ldap_attr_lastname', '', 'unicode'), ('ldap_attr_email', '', 'unicode')] for k, v, t in old_ldap: - old_setting = models.RhodeCodeSetting.get_by_name(k) + old_setting = models.Setting.get_by_name(k) name = 'auth_%s' % k - setting = models.RhodeCodeSetting.get_by_name(name) + setting = models.Setting.get_by_name(name) if not setting: # if we don't have this option create it - setting = models.RhodeCodeSetting(name, old_setting.app_settings_value, t) + setting = models.Setting(name, old_setting.app_settings_value, t) _SESSION().add(setting) _SESSION().commit()
--- a/kallithea/lib/dbmigrate/versions/019_version_2_0_0.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/lib/dbmigrate/versions/019_version_2_0_0.py Wed Jul 02 19:05:36 2014 -0400 @@ -25,7 +25,7 @@ """ _reset_base(migrate_engine) from kallithea.lib.dbmigrate.schema import db_2_0_0 - tbl = db_2_0_0.RhodeCodeSetting.__table__ + tbl = db_2_0_0.Setting.__table__ settings_value = tbl.columns.app_settings_value settings_value.alter(type=String(4096))
--- a/kallithea/lib/dbmigrate/versions/021_version_2_0_2.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/lib/dbmigrate/versions/021_version_2_0_2.py Wed Jul 02 19:05:36 2014 -0400 @@ -62,13 +62,13 @@ _SESSION().add(gr) _SESSION().commit() - repo_store_path = models.RhodeCodeUi.get_repos_location() + repo_store_path = models.Ui.get_repos_location() _store = os.path.join(repo_store_path, '.cache', 'largefiles') notify('Setting largefiles usercache') print _store - if not models.RhodeCodeUi.get_by_key('usercache'): - largefiles = models.RhodeCodeUi() + if not models.Ui.get_by_key('usercache'): + largefiles = models.Ui() largefiles.ui_section = 'largefiles' largefiles.ui_key = 'usercache' largefiles.ui_value = _store
--- a/kallithea/lib/dbmigrate/versions/024_version_2_1_0.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/lib/dbmigrate/versions/024_version_2_1_0.py Wed Jul 02 19:05:36 2014 -0400 @@ -42,7 +42,7 @@ notify('migrating options from .ini file') use_gravatar = str2bool(config.get('use_gravatar')) print('Setting gravatar use to: %s' % use_gravatar) - sett = models.RhodeCodeSetting.create_or_update('use_gravatar', + sett = models.Setting.create_or_update('use_gravatar', use_gravatar, 'bool') _SESSION().add(sett) _SESSION.commit() @@ -52,7 +52,7 @@ gravatar_url = config.get('alternative_gravatar_url') print('Setting gravatar url to:%s' % gravatar_url) - sett = models.RhodeCodeSetting.create_or_update('gravatar_url', + sett = models.Setting.create_or_update('gravatar_url', gravatar_url, 'unicode') _SESSION().add(sett) _SESSION.commit() @@ -61,7 +61,7 @@ clone_uri_tmpl = models.Repository.DEFAULT_CLONE_URI print('settings new clone url template to %s' % clone_uri_tmpl) - sett = models.RhodeCodeSetting.create_or_update('clone_uri_tmpl', + sett = models.Setting.create_or_update('clone_uri_tmpl', clone_uri_tmpl, 'unicode') _SESSION().add(sett) _SESSION.commit()
--- a/kallithea/lib/dbmigrate/versions/025_version_2_1_0.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/lib/dbmigrate/versions/025_version_2_1_0.py Wed Jul 02 19:05:36 2014 -0400 @@ -37,7 +37,7 @@ def fixups(models, _SESSION): notify('Creating upgrade URL') - sett = models.RhodeCodeSetting.create_or_update('update_url', - models.RhodeCodeSetting.DEFAULT_UPDATE_URL, 'unicode') + sett = models.Setting.create_or_update('update_url', + models.Setting.DEFAULT_UPDATE_URL, 'unicode') _SESSION().add(sett) _SESSION.commit()
--- a/kallithea/lib/dbmigrate/versions/029_version_2_2_3.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/lib/dbmigrate/versions/029_version_2_2_3.py Wed Jul 02 19:05:36 2014 -0400 @@ -43,10 +43,10 @@ ] for name, default, type_ in settings: - setting = models.RhodeCodeSetting.get_by_name(name) + setting = models.Setting.get_by_name(name) if not setting: # if we don't have this option create it - setting = models.RhodeCodeSetting(name, default, type_) + setting = models.Setting(name, default, type_) setting._app_settings_type = type_ _SESSION().add(setting) _SESSION().commit()
--- a/kallithea/lib/hooks.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/lib/hooks.py Wed Jul 02 19:05:36 2014 -0400 @@ -388,7 +388,7 @@ from sqlalchemy import engine_from_config from kallithea.config.environment import load_environment from kallithea.model import init_model - from kallithea.model.db import RhodeCodeUi + from kallithea.model.db import Ui from kallithea.lib.utils import make_ui extras = _extract_extras(env) @@ -422,7 +422,7 @@ pre_push(baseui, repo) # if push hook is enabled via web interface - elif hook_type == 'post' and _hooks.get(RhodeCodeUi.HOOK_PUSH): + elif hook_type == 'post' and _hooks.get(Ui.HOOK_PUSH): rev_data = [] for l in revs: old_rev, new_rev, ref = l.split(' ')
--- a/kallithea/lib/middleware/simplegit.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/lib/middleware/simplegit.py Wed Jul 02 19:05:36 2014 -0400 @@ -34,7 +34,7 @@ from paste.httpheaders import REMOTE_USER, AUTH_TYPE from webob.exc import HTTPNotFound, HTTPForbidden, HTTPInternalServerError, \ HTTPNotAcceptable -from kallithea.model.db import User, RhodeCodeUi +from kallithea.model.db import User, Ui from kallithea.lib.utils2 import safe_str, fix_PATH, get_server_url,\ _set_extras @@ -289,7 +289,7 @@ if action == 'pull': # stupid git, emulate pre-pull hook ! pre_pull(ui=baseui, repo=_repo._repo) - if action == 'pull' and _hooks.get(RhodeCodeUi.HOOK_PULL): + if action == 'pull' and _hooks.get(Ui.HOOK_PULL): log_pull_action(ui=baseui, repo=_repo._repo) def __inject_extras(self, repo_path, baseui, extras={}):
--- a/kallithea/lib/utils.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/lib/utils.py Wed Jul 02 19:05:36 2014 -0400 @@ -52,8 +52,8 @@ from kallithea.lib.caching_query import FromCache from kallithea.model import meta -from kallithea.model.db import Repository, User, RhodeCodeUi, \ - UserLog, RepoGroup, RhodeCodeSetting, CacheInvalidation, UserGroup +from kallithea.model.db import Repository, User, Ui, \ + UserLog, RepoGroup, Setting, CacheInvalidation, UserGroup from kallithea.model.meta import Session from kallithea.model.repo_group import RepoGroupModel from kallithea.lib.utils2 import safe_str, safe_unicode, get_current_authuser @@ -373,7 +373,7 @@ elif read_from == 'db': sa = meta.Session() - ret = sa.query(RhodeCodeUi)\ + ret = sa.query(Ui)\ .options(FromCache("sql_cache_short", "get_hg_ui_settings"))\ .all() @@ -400,7 +400,7 @@ :param config: """ - hgsettings = RhodeCodeSetting.get_app_settings() + hgsettings = Setting.get_app_settings() for k, v in hgsettings.items(): config[k] = v @@ -487,7 +487,7 @@ added = [] ##creation defaults - defs = RhodeCodeSetting.get_default_repo_settings(strip_prefix=True) + defs = Setting.get_default_repo_settings(strip_prefix=True) enable_statistics = defs.get('repo_enable_statistics') enable_locking = defs.get('repo_enable_locking') enable_downloads = defs.get('repo_enable_downloads')
--- a/kallithea/model/db.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/model/db.py Wed Jul 02 19:05:36 2014 -0400 @@ -155,7 +155,7 @@ return '<DB:%s>' % (self.__class__.__name__) -class RhodeCodeSetting(Base, BaseModel): +class Setting(Base, BaseModel): __tablename__ = 'rhodecode_settings' __table_args__ = ( UniqueConstraint('app_settings_name'), @@ -321,7 +321,7 @@ return info -class RhodeCodeUi(Base, BaseModel): +class Ui(Base, BaseModel): __tablename__ = 'rhodecode_ui' __table_args__ = ( UniqueConstraint('ui_key'), @@ -1076,8 +1076,8 @@ :param cls: """ - q = Session().query(RhodeCodeUi)\ - .filter(RhodeCodeUi.ui_key == cls.url_sep()) + q = Session().query(Ui)\ + .filter(Ui.ui_key == cls.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -1126,7 +1126,7 @@ Returns base full path for that repository means where it actually exists on a filesystem """ - q = Session().query(RhodeCodeUi).filter(RhodeCodeUi.ui_key == + q = Session().query(Ui).filter(Ui.ui_key == Repository.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -1205,7 +1205,7 @@ locked_date=time_to_datetime(self.locked[1]) \ if self.locked[1] else None ) - rc_config = RhodeCodeSetting.get_app_settings() + rc_config = Setting.get_app_settings() repository_fields = str2bool(rc_config.get('rhodecode_repository_fields')) if repository_fields: for f in self.extra_fields: @@ -2457,8 +2457,8 @@ :param cls: """ from kallithea.model.gist import GIST_STORE_LOC - q = Session().query(RhodeCodeUi)\ - .filter(RhodeCodeUi.ui_key == URL_SEP) + q = Session().query(Ui)\ + .filter(Ui.ui_key == URL_SEP) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return os.path.join(q.one().ui_value, GIST_STORE_LOC)
--- a/kallithea/model/repo.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/model/repo.py Wed Jul 02 19:05:36 2014 -0400 @@ -42,8 +42,8 @@ from kallithea.model import BaseModel from kallithea.model.db import Repository, UserRepoToPerm, UserGroupRepoToPerm, \ UserRepoGroupToPerm, UserGroupRepoGroupToPerm, User, Permission, \ - Statistics, UserGroup, RhodeCodeUi, RepoGroup, \ - RhodeCodeSetting, RepositoryField + Statistics, UserGroup, Ui, RepoGroup, \ + Setting, RepositoryField from kallithea.lib import helpers as h from kallithea.lib.auth import HasRepoPermissionAny, HasUserGroupPermissionAny @@ -91,7 +91,7 @@ Gets the repositories root path from database """ - q = self.sa.query(RhodeCodeUi).filter(RhodeCodeUi.ui_key == '/').one() + q = self.sa.query(Ui).filter(Ui.ui_key == '/').one() return q.ui_value def get(self, repo_id, cache=False):
--- a/kallithea/model/repo_group.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/model/repo_group.py Wed Jul 02 19:05:36 2014 -0400 @@ -33,7 +33,7 @@ from kallithea.lib.utils2 import LazyProperty from kallithea.model import BaseModel -from kallithea.model.db import RepoGroup, RhodeCodeUi, UserRepoGroupToPerm, \ +from kallithea.model.db import RepoGroup, Ui, UserRepoGroupToPerm, \ User, Permission, UserGroupRepoGroupToPerm, UserGroup, Repository log = logging.getLogger(__name__) @@ -57,7 +57,7 @@ Gets the repositories root path from database """ - q = RhodeCodeUi.get_by_key('/') + q = Ui.get_by_key('/') return q.ui_value def _create_default_perms(self, new_group):
--- a/kallithea/model/scm.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/model/scm.py Wed Jul 02 19:05:36 2014 -0400 @@ -52,7 +52,7 @@ from kallithea.lib.utils import get_filesystem_repos, make_ui, \ action_logger from kallithea.model import BaseModel -from kallithea.model.db import Repository, RhodeCodeUi, CacheInvalidation, \ +from kallithea.model.db import Repository, Ui, CacheInvalidation, \ UserFollowing, UserLog, User, RepoGroup, PullRequest from kallithea.lib.hooks import log_push_action from kallithea.lib.exceptions import NonRelativePathError, IMCCommitError @@ -256,7 +256,7 @@ Gets the repositories root path from database """ - q = self.sa.query(RhodeCodeUi).filter(RhodeCodeUi.ui_key == '/').one() + q = self.sa.query(Ui).filter(Ui.ui_key == '/').one() return q.ui_value
--- a/kallithea/tests/api/api_base.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/tests/api/api_base.py Wed Jul 02 19:05:36 2014 -0400 @@ -34,7 +34,7 @@ from kallithea.model.meta import Session from kallithea.model.scm import ScmModel from kallithea.model.gist import GistModel -from kallithea.model.db import Repository, User, RhodeCodeSetting +from kallithea.model.db import Repository, User, Setting from kallithea.lib.utils2 import time_to_datetime @@ -2291,5 +2291,5 @@ def test_api_get_server_info(self): id_, params = _build_data(self.apikey, 'get_server_info') response = api_call(self, params) - expected = RhodeCodeSetting.get_server_info() + expected = Setting.get_server_info() self._compare_ok(id_, expected, given=response.body)
--- a/kallithea/tests/functional/test_admin_auth_settings.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/tests/functional/test_admin_auth_settings.py Wed Jul 02 19:05:36 2014 -0400 @@ -1,5 +1,5 @@ from kallithea.tests import * -from kallithea.model.db import RhodeCodeSetting +from kallithea.model.db import Setting class TestAuthSettingsController(TestController): @@ -47,7 +47,7 @@ response = self.app.post(url=test_url, params=params) self.checkSessionFlash(response, 'Auth settings updated successfully') - new_settings = RhodeCodeSetting.get_auth_settings() + new_settings = Setting.get_auth_settings() self.assertEqual(new_settings['auth_ldap_host'], u'dc.example.com', 'fail db write compare')
--- a/kallithea/tests/functional/test_admin_defaults.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/tests/functional/test_admin_defaults.py Wed Jul 02 19:05:36 2014 -0400 @@ -1,5 +1,5 @@ from kallithea.tests import * -from kallithea.model.db import RhodeCodeSetting +from kallithea.model.db import Setting class TestDefaultsController(TestController): @@ -36,7 +36,7 @@ response = self.app.put(url('default', id='default'), params=params) self.checkSessionFlash(response, 'Default settings updated successfully') - defs = RhodeCodeSetting.get_default_repo_settings() + defs = Setting.get_default_repo_settings() self.assertEqual(params, defs) def test_update_params_false_git(self): @@ -50,7 +50,7 @@ } response = self.app.put(url('default', id='default'), params=params) self.checkSessionFlash(response, 'Default settings updated successfully') - defs = RhodeCodeSetting.get_default_repo_settings() + defs = Setting.get_default_repo_settings() self.assertEqual(params, defs) def test_update_browser_fakeout(self):
--- a/kallithea/tests/functional/test_admin_settings.py Wed Jul 02 19:05:31 2014 -0400 +++ b/kallithea/tests/functional/test_admin_settings.py Wed Jul 02 19:05:36 2014 -0400 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from kallithea.lib.auth import get_crypt_password, check_password -from kallithea.model.db import User, RhodeCodeSetting, Repository, RhodeCodeUi +from kallithea.model.db import User, Setting, Repository, Ui from kallithea.tests import * from kallithea.tests.fixture import Fixture from kallithea.lib import helpers as h @@ -58,7 +58,7 @@ response.mustcontain('test_hooks_2') response.mustcontain('cd /tmp2') - hook_id = RhodeCodeUi.get_by_key('test_hooks_2').ui_id + hook_id = Ui.get_by_key('test_hooks_2').ui_id ## delete self.app.post(url('admin_settings_hooks'), params=dict(hook_id=hook_id)) @@ -89,7 +89,7 @@ self.checkSessionFlash(response, 'Updated application settings') - self.assertEqual(RhodeCodeSetting + self.assertEqual(Setting .get_app_settings()['rhodecode_ga_code'], new_ga_code) response = response.follow() @@ -109,7 +109,7 @@ )) self.checkSessionFlash(response, 'Updated application settings') - self.assertEqual(RhodeCodeSetting + self.assertEqual(Setting .get_app_settings()['rhodecode_ga_code'], new_ga_code) response = response.follow() @@ -129,7 +129,7 @@ )) self.checkSessionFlash(response, 'Updated application settings') - self.assertEqual(RhodeCodeSetting + self.assertEqual(Setting .get_app_settings()['rhodecode_captcha_private_key'], '1234567890') response = self.app.get(url('register')) @@ -149,7 +149,7 @@ )) self.checkSessionFlash(response, 'Updated application settings') - self.assertEqual(RhodeCodeSetting + self.assertEqual(Setting .get_app_settings()['rhodecode_captcha_private_key'], '') response = self.app.get(url('register')) @@ -171,7 +171,7 @@ )) self.checkSessionFlash(response, 'Updated application settings') - self.assertEqual(RhodeCodeSetting + self.assertEqual(Setting .get_app_settings()['rhodecode_title'], new_title.decode('utf-8'))