Mercurial > kallithea

comparison rhodecode/controllers/admin/settings.py @ 691:7486da5f0628 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Refactor codes for scm model Some test updates, added test for admin user controller
author Marcin Kuzminski <marcin@python-works.com>
date Sun, 14 Nov 2010 22:54:16 +0100
parents b9442a8b5e02
children cb0d9ce6ac5c
comparison
equal deleted inserted replaced
690:4685f3eafd35 691:7486da5f0628
34 from rhodecode.lib.utils import repo2db_mapper, invalidate_cache, \ 34 from rhodecode.lib.utils import repo2db_mapper, invalidate_cache, \
35 set_rhodecode_config, get_hg_settings, get_hg_ui_settings 35 set_rhodecode_config, get_hg_settings, get_hg_ui_settings
36 from rhodecode.model.db import RhodeCodeSettings, RhodeCodeUi, Repository 36 from rhodecode.model.db import RhodeCodeSettings, RhodeCodeUi, Repository
37 from rhodecode.model.forms import UserForm, ApplicationSettingsForm, \ 37 from rhodecode.model.forms import UserForm, ApplicationSettingsForm, \
38 ApplicationUiSettingsForm 38 ApplicationUiSettingsForm
39 from rhodecode.model.hg import HgModel 39 from rhodecode.model.scm import ScmModel
40 from rhodecode.model.user import UserModel 40 from rhodecode.model.user import UserModel
41 from rhodecode.lib.celerylib import tasks, run_task 41 from rhodecode.lib.celerylib import tasks, run_task
42 from sqlalchemy import func 42 from sqlalchemy import func
43 import formencode 43 import formencode
44 import logging 44 import logging
97 # url('admin_setting', setting_id=ID) 97 # url('admin_setting', setting_id=ID)
98 if setting_id == 'mapping': 98 if setting_id == 'mapping':
99 rm_obsolete = request.POST.get('destroy', False) 99 rm_obsolete = request.POST.get('destroy', False)
100 log.debug('Rescanning directories with destroy=%s', rm_obsolete) 100 log.debug('Rescanning directories with destroy=%s', rm_obsolete)
101 101
102 initial = HgModel().repo_scan(g.paths[0][1], g.baseui) 102 initial = ScmModel().repo_scan(g.paths[0][1], g.baseui)
103 for repo_name in initial.keys(): 103 for repo_name in initial.keys():
104 invalidate_cache('get_repo_cached_%s' % repo_name) 104 invalidate_cache('get_repo_cached_%s' % repo_name)
105 105
106 repo2db_mapper(initial, rm_obsolete) 106 repo2db_mapper(initial, rm_obsolete)
107 107
251 c.user = UserModel(self.sa).get(c.rhodecode_user.user_id, cache=False) 251 c.user = UserModel(self.sa).get(c.rhodecode_user.user_id, cache=False)
252 all_repos = self.sa.query(Repository)\ 252 all_repos = self.sa.query(Repository)\
253 .filter(Repository.user_id == c.user.user_id)\ 253 .filter(Repository.user_id == c.user.user_id)\
254 .order_by(func.lower(Repository.repo_name))\ 254 .order_by(func.lower(Repository.repo_name))\
255 .all() 255 .all()
256 c.user_repos = HgModel().get_repos(all_repos) 256 c.user_repos = ScmModel().get_repos(all_repos)
257 257
258 if c.user.username == 'default': 258 if c.user.username == 'default':
259 h.flash(_("You can't edit this user since it's" 259 h.flash(_("You can't edit this user since it's"
260 " crucial for entire application"), category='warning') 260 " crucial for entire application"), category='warning')
261 return redirect(url('users')) 261 return redirect(url('users'))
292 c.user = UserModel(self.sa).get(c.rhodecode_user.user_id, cache=False) 292 c.user = UserModel(self.sa).get(c.rhodecode_user.user_id, cache=False)
293 all_repos = self.sa.query(Repository)\ 293 all_repos = self.sa.query(Repository)\
294 .filter(Repository.user_id == c.user.user_id)\ 294 .filter(Repository.user_id == c.user.user_id)\
295 .order_by(func.lower(Repository.repo_name))\ 295 .order_by(func.lower(Repository.repo_name))\
296 .all() 296 .all()
297 c.user_repos = HgModel().get_repos(all_repos) 297 c.user_repos = ScmModel().get_repos(all_repos)
298 298
299 return htmlfill.render( 299 return htmlfill.render(
300 render('admin/users/user_edit_my_account.html'), 300 render('admin/users/user_edit_my_account.html'),
301 defaults=errors.value, 301 defaults=errors.value,
302 errors=errors.error_dict or {}, 302 errors=errors.error_dict or {},