Mercurial > kallithea
comparison rhodecode/controllers/admin/settings.py @ 4090:7676606f7622
Added more detailed (and localized) information if hgsubversion is not
installed while enabling from settings
author | Grzegorz Rożniecki <xaerxess@gmail.com> |
---|---|
date | Wed, 17 Jul 2013 09:19:10 +0200 |
parents | 9b4ba12ef8c3 |
children | ffd45b185016 |
comparison
equal
deleted
inserted
replaced
4089:a5888ca796b5 | 4090:7676606f7622 |
---|---|
39 from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator, \ | 39 from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator, \ |
40 HasPermissionAnyDecorator, NotAnonymous, HasPermissionAny,\ | 40 HasPermissionAnyDecorator, NotAnonymous, HasPermissionAny,\ |
41 HasReposGroupPermissionAll, HasReposGroupPermissionAny, AuthUser | 41 HasReposGroupPermissionAll, HasReposGroupPermissionAny, AuthUser |
42 from rhodecode.lib.base import BaseController, render | 42 from rhodecode.lib.base import BaseController, render |
43 from rhodecode.lib.celerylib import tasks, run_task | 43 from rhodecode.lib.celerylib import tasks, run_task |
44 from rhodecode.lib.exceptions import HgsubversionImportError | |
44 from rhodecode.lib.utils import repo2db_mapper, set_rhodecode_config, \ | 45 from rhodecode.lib.utils import repo2db_mapper, set_rhodecode_config, \ |
45 check_git_version | 46 check_git_version |
46 from rhodecode.model.db import RhodeCodeUi, Repository, RepoGroup, \ | 47 from rhodecode.model.db import RhodeCodeUi, Repository, RepoGroup, \ |
47 RhodeCodeSetting, PullRequest, PullRequestReviewers | 48 RhodeCodeSetting, PullRequest, PullRequestReviewers |
48 from rhodecode.model.forms import UserForm, ApplicationSettingsForm, \ | 49 from rhodecode.model.forms import UserForm, ApplicationSettingsForm, \ |
285 sett = RhodeCodeUi() | 286 sett = RhodeCodeUi() |
286 sett.ui_key = 'hgsubversion' | 287 sett.ui_key = 'hgsubversion' |
287 sett.ui_section = 'extensions' | 288 sett.ui_section = 'extensions' |
288 | 289 |
289 sett.ui_active = form_result['extensions_hgsubversion'] | 290 sett.ui_active = form_result['extensions_hgsubversion'] |
291 if sett.ui_active: | |
292 try: | |
293 import hgsubversion | |
294 except ImportError: | |
295 raise HgsubversionImportError | |
290 Session().add(sett) | 296 Session().add(sett) |
291 | 297 |
292 # sett = RhodeCodeUi.get_by_key('hggit') | 298 # sett = RhodeCodeUi.get_by_key('hggit') |
293 # if not sett: | 299 # if not sett: |
294 # #make one if it's not there ! | 300 # #make one if it's not there ! |
300 # Session().add(sett) | 306 # Session().add(sett) |
301 | 307 |
302 Session().commit() | 308 Session().commit() |
303 | 309 |
304 h.flash(_('Updated VCS settings'), category='success') | 310 h.flash(_('Updated VCS settings'), category='success') |
311 | |
312 except HgsubversionImportError: | |
313 log.error(traceback.format_exc()) | |
314 h.flash(_('Unable to activate hgsubversion support. ' | |
315 'The "hgsubversion" library is missing'), | |
316 category='error') | |
305 | 317 |
306 except Exception: | 318 except Exception: |
307 log.error(traceback.format_exc()) | 319 log.error(traceback.format_exc()) |
308 h.flash(_('Error occurred during updating ' | 320 h.flash(_('Error occurred during updating ' |
309 'application settings'), category='error') | 321 'application settings'), category='error') |