kallithea Changeset - e2af60e480ce

Changeset - e2af60e480ce

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 13 years ago 2012-06-06 19:19:21
marcin@python-works.com

Removed hardcoded hooks names from settings.
Added helper for getting repos_location

2 files changed with 22 insertions and 17 deletions:

rhodecode/controllers/admin/settings.py

rhodecode/model/db.py

0 comments (0 inline, 0 general)

rhodecode/controllers/admin/settings.py

➞

Show inline comments

@@ @@ -174,7 +174,8 @@ class SettingsController(BaseController) @@
             application_form = ApplicationUiSettingsForm()()
             try:
                 form_result = application_form.to_python(dict(request.POST))
                 # fix namespaces for hooks
                 _f = lambda s: s.replace('.', '_')
                 try:
                     hgsettings1 = self.sa.query(RhodeCodeUi)\
@@ @@ -187,28 +188,28 @@ class SettingsController(BaseController) @@
                     #HOOKS
                     hgsettings3 = self.sa.query(RhodeCodeUi)\
                     .filter(RhodeCodeUi.ui_key == 'changegroup.update').one()
                     hgsettings3.ui_active = \
                         bool(form_result['hooks_changegroup_update'])
                     .filter(RhodeCodeUi.ui_key == RhodeCodeUi.HOOK_UPDATE)\
                     .one()
                     hgsettings3.ui_active = bool(form_result[_f('hooks_%s' %
                                                  RhodeCodeUi.HOOK_UPDATE)])
                     hgsettings4 = self.sa.query(RhodeCodeUi)\
                     .filter(RhodeCodeUi.ui_key ==
                             'changegroup.repo_size').one()
                     hgsettings4.ui_active = \
                         bool(form_result['hooks_changegroup_repo_size'])
                     .filter(RhodeCodeUi.ui_key == RhodeCodeUi.HOOK_REPO_SIZE)\
                     .one()
                     hgsettings4.ui_active = bool(form_result[_f('hooks_%s' %
                                                  RhodeCodeUi.HOOK_REPO_SIZE)])
                     hgsettings5 = self.sa.query(RhodeCodeUi)\
                     .filter(RhodeCodeUi.ui_key ==
                             'pretxnchangegroup.push_logger').one()
                     hgsettings5.ui_active = \
                         bool(form_result['hooks_pretxnchangegroup'
                                          '_push_logger'])
                     .filter(RhodeCodeUi.ui_key == RhodeCodeUi.HOOK_PUSH)\
                     .one()
                     hgsettings5.ui_active = bool(form_result[_f('hooks_%s' %
                                                  RhodeCodeUi.HOOK_PUSH)])
                     hgsettings6 = self.sa.query(RhodeCodeUi)\
                     .filter(RhodeCodeUi.ui_key ==
                             'preoutgoing.pull_logger').one()
                     hgsettings6.ui_active = \
                         bool(form_result['hooks_preoutgoing_pull_logger'])
                     .filter(RhodeCodeUi.ui_key == RhodeCodeUi.HOOK_PULL)\
                     .one()
                     hgsettings6.ui_active = bool(form_result[_f('hooks_%s' %
                                                  RhodeCodeUi.HOOK_PULL)])
                     self.sa.add(hgsettings1)
                     self.sa.add(hgsettings2)

rhodecode/model/db.py

➞

Show inline comments

@@ @@ -269,6 +269,10 @@ class RhodeCodeUi(Base, BaseModel): @@
         return q.all()
     @classmethod
     def get_repos_location(cls):
         return cls.get_by_key('/').one().ui_value
     @classmethod
     def create_or_update_hook(cls, key, val):
         new_ui = cls.get_by_key(key).scalar() or cls()
         new_ui.ui_section = 'hooks'

0 comments (0 inline, 0 general)