Mercurial > kallithea

comparison rhodecode/controllers/admin/settings.py @ 1292:c0335c1dee36 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added some fixes to LDAP form re-submition, new simples ldap-settings getter. Updated docs for new ldap fixes. Removed depracated settings model, in exchange for db model classmethods.
author Marcin Kuzminski <marcin@python-works.com>
date Wed, 27 Apr 2011 01:19:17 +0200
parents 5f2fbab7c429
children 3bce31f026b8
comparison
equal deleted inserted replaced
1291:34a9b64a5e00 1292:c0335c1dee36
38 HasPermissionAnyDecorator, NotAnonymous 38 HasPermissionAnyDecorator, NotAnonymous
39 from rhodecode.lib.base import BaseController, render 39 from rhodecode.lib.base import BaseController, render
40 from rhodecode.lib.celerylib import tasks, run_task 40 from rhodecode.lib.celerylib import tasks, run_task
41 from rhodecode.lib.utils import repo2db_mapper, invalidate_cache, \ 41 from rhodecode.lib.utils import repo2db_mapper, invalidate_cache, \
42 set_rhodecode_config, repo_name_slug 42 set_rhodecode_config, repo_name_slug
43 from rhodecode.model.db import RhodeCodeUi, Repository, Group 43 from rhodecode.model.db import RhodeCodeUi, Repository, Group, \
44 RhodeCodeSettings
44 from rhodecode.model.forms import UserForm, ApplicationSettingsForm, \ 45 from rhodecode.model.forms import UserForm, ApplicationSettingsForm, \
45 ApplicationUiSettingsForm 46 ApplicationUiSettingsForm
46 from rhodecode.model.scm import ScmModel 47 from rhodecode.model.scm import ScmModel
47 from rhodecode.model.settings import SettingsModel
48 from rhodecode.model.user import UserModel 48 from rhodecode.model.user import UserModel
49 49
50 log = logging.getLogger(__name__) 50 log = logging.getLogger(__name__)
51 51
52 52
66 @HasPermissionAllDecorator('hg.admin') 66 @HasPermissionAllDecorator('hg.admin')
67 def index(self, format='html'): 67 def index(self, format='html'):
68 """GET /admin/settings: All items in the collection""" 68 """GET /admin/settings: All items in the collection"""
69 # url('admin_settings') 69 # url('admin_settings')
70 70
71 defaults = SettingsModel().get_app_settings() 71 defaults = RhodeCodeSettings.get_app_settings()
72 defaults.update(self.get_hg_ui_settings()) 72 defaults.update(self.get_hg_ui_settings())
73 return htmlfill.render( 73 return htmlfill.render(
74 render('admin/settings/settings.html'), 74 render('admin/settings/settings.html'),
75 defaults=defaults, 75 defaults=defaults,
76 encoding="UTF-8", 76 encoding="UTF-8",
119 if setting_id == 'global': 119 if setting_id == 'global':
120 120
121 application_form = ApplicationSettingsForm()() 121 application_form = ApplicationSettingsForm()()
122 try: 122 try:
123 form_result = application_form.to_python(dict(request.POST)) 123 form_result = application_form.to_python(dict(request.POST))
124 settings_model = SettingsModel()
125 124
126 try: 125 try:
127 hgsettings1 = settings_model.get('title') 126 hgsettings1 = RhodeCodeSettings.get_by_name('title')
128 hgsettings1.app_settings_value = \ 127 hgsettings1.app_settings_value = \
129 form_result['rhodecode_title'] 128 form_result['rhodecode_title']
130 129
131 hgsettings2 = settings_model.get('realm') 130 hgsettings2 = RhodeCodeSettings.get_by_name('realm')
132 hgsettings2.app_settings_value = \ 131 hgsettings2.app_settings_value = \
133 form_result['rhodecode_realm'] 132 form_result['rhodecode_realm']
134 133
135 hgsettings3 = settings_model.get('ga_code') 134 hgsettings3 = RhodeCodeSettings.get_by_name('ga_code')
136 hgsettings3.app_settings_value = \ 135 hgsettings3.app_settings_value = \
137 form_result['rhodecode_ga_code'] 136 form_result['rhodecode_ga_code']
138 137
139 self.sa.add(hgsettings1) 138 self.sa.add(hgsettings1)
140 self.sa.add(hgsettings2) 139 self.sa.add(hgsettings2)