Mercurial > kallithea
changeset 3570:8173b0cfe9bd beta
settings: simplify handling of form values for hooks and extensions
This makes simpler to follow the code path and search for input input field
names. The form field names are hardcoded in the template, so generating them
programmatically in the controller do not really add any flexibility.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Wed, 20 Mar 2013 15:00:31 +0100 |
parents | aa8ec270178b |
children | 6c88624c719b |
files | rhodecode/controllers/admin/settings.py |
diffstat | 1 files changed, 7 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/admin/settings.py Wed Mar 20 15:00:28 2013 +0100 +++ b/rhodecode/controllers/admin/settings.py Wed Mar 20 15:00:31 2013 +0100 @@ -236,9 +236,6 @@ ) try: - # fix namespaces for hooks and extensions - _f = lambda s: s.replace('.', '_') - sett = RhodeCodeUi.get_by_key('push_ssl') sett.ui_value = form_result['web_push_ssl'] Session().add(sett) @@ -249,23 +246,19 @@ #HOOKS sett = RhodeCodeUi.get_by_key(RhodeCodeUi.HOOK_UPDATE) - sett.ui_active = form_result[_f('hooks_%s' % - RhodeCodeUi.HOOK_UPDATE)] + sett.ui_active = form_result['hooks_changegroup_update'] Session().add(sett) sett = RhodeCodeUi.get_by_key(RhodeCodeUi.HOOK_REPO_SIZE) - sett.ui_active = form_result[_f('hooks_%s' % - RhodeCodeUi.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_active = form_result[_f('hooks_%s' % - RhodeCodeUi.HOOK_PUSH)] + sett.ui_active = form_result['hooks_changegroup_push_logger'] Session().add(sett) sett = RhodeCodeUi.get_by_key(RhodeCodeUi.HOOK_PULL) - sett.ui_active = form_result[_f('hooks_%s' % - RhodeCodeUi.HOOK_PULL)] + sett.ui_active = form_result['hooks_outgoing_pull_logger'] Session().add(sett) @@ -276,7 +269,7 @@ sett = RhodeCodeUi() sett.ui_key = 'largefiles' sett.ui_section = 'extensions' - sett.ui_active = form_result[_f('extensions_largefiles')] + sett.ui_active = form_result['extensions_largefiles'] Session().add(sett) sett = RhodeCodeUi.get_by_key('hgsubversion') @@ -286,7 +279,7 @@ sett.ui_key = 'hgsubversion' sett.ui_section = 'extensions' - sett.ui_active = form_result[_f('extensions_hgsubversion')] + sett.ui_active = form_result['extensions_hgsubversion'] Session().add(sett) # sett = RhodeCodeUi.get_by_key('hggit') @@ -296,7 +289,7 @@ # sett.ui_key = 'hggit' # sett.ui_section = 'extensions' # -# sett.ui_active = form_result[_f('extensions_hggit')] +# sett.ui_active = form_result['extensions_hggit'] # Session().add(sett) Session().commit()