Mercurial > kallithea
changeset 661:673de12e6bf6 beta
added option to enable/disable of logger hooks from admin panel.
some docs/setup updates
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Sat, 06 Nov 2010 00:37:21 +0100 |
| parents | df61378032f3 |
| children | 373ee7031003 |
| files | docs/changelog.rst docs/upgrade.rst rhodecode/controllers/admin/settings.py rhodecode/model/forms.py rhodecode/public/css/style.css rhodecode/templates/admin/settings/settings.html setup.py |
| diffstat | 7 files changed, 27 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/changelog.rst Fri Nov 05 22:36:51 2010 +0100 +++ b/docs/changelog.rst Sat Nov 06 00:37:21 2010 +0100 @@ -10,6 +10,8 @@ - performance upgrade for cached repos list - gui optimizations - main page quick filter for filtering repositories +- more detailed action logger (based on hooks) with pushed changesets lists +- a lot of fixes for file browser 1.0.0 (**2010-11-02**) ----------------------
--- a/docs/upgrade.rst Fri Nov 05 22:36:51 2010 +0100 +++ b/docs/upgrade.rst Sat Nov 06 00:37:21 2010 +0100 @@ -24,6 +24,9 @@ This will display any changes made from new version of RhodeCode To your current config. And tries to do an automerge. +It's also good to rebuild the whoosh index since after upgrading the whoosh +versionthere could be introduced incompatible index changes + .. _virtualenv: http://pypi.python.org/pypi/virtualenv .. _python: http://www.python.org/
--- a/rhodecode/controllers/admin/settings.py Fri Nov 05 22:36:51 2010 +0100 +++ b/rhodecode/controllers/admin/settings.py Sat Nov 06 00:37:21 2010 +0100 @@ -173,13 +173,21 @@ .filter(RhodeCodeUi.ui_key == 'changegroup.repo_size').one() hgsettings4.ui_active = bool(form_result['hooks_changegroup_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']) + hgsettings6 = self.sa.query(RhodeCodeUi)\ + .filter(RhodeCodeUi.ui_key == 'preoutgoing.pull_logger').one() + hgsettings6.ui_active = bool(form_result['hooks_preoutgoing_pull_logger']) self.sa.add(hgsettings1) self.sa.add(hgsettings2) self.sa.add(hgsettings3) self.sa.add(hgsettings4) + self.sa.add(hgsettings5) + self.sa.add(hgsettings6) self.sa.commit() h.flash(_('Updated mercurial settings'),
--- a/rhodecode/model/forms.py Fri Nov 05 22:36:51 2010 +0100 +++ b/rhodecode/model/forms.py Sat Nov 06 00:37:21 2010 +0100 @@ -348,6 +348,8 @@ paths_root_path = All(ValidPath(), UnicodeString(strip=True, min=1, not_empty=True)) hooks_changegroup_update = OneOf(['True', 'False'], if_missing=False) hooks_changegroup_repo_size = OneOf(['True', 'False'], if_missing=False) + hooks_pretxnchangegroup_push_logger = OneOf(['True', 'False'], if_missing=False) + hooks_preoutgoing_pull_logger = OneOf(['True', 'False'], if_missing=False) return _ApplicationUiSettingsForm
--- a/rhodecode/public/css/style.css Fri Nov 05 22:36:51 2010 +0100 +++ b/rhodecode/public/css/style.css Sat Nov 06 00:37:21 2010 +0100 @@ -2315,7 +2315,7 @@ #q_filter{ border:0 none; -color:#CDCDCD; +color:#AAAAAA; margin-bottom:-4px; margin-top:-4px; padding-left:3px;
--- a/rhodecode/templates/admin/settings/settings.html Fri Nov 05 22:36:51 2010 +0100 +++ b/rhodecode/templates/admin/settings/settings.html Sat Nov 06 00:37:21 2010 +0100 @@ -136,7 +136,15 @@ <div class="checkbox"> ${h.checkbox('hooks_changegroup_repo_size','True')} <label for="hooks_changegroup_repo_size">${_('Show repository size after push')}</label> - </div> + </div> + <div class="checkbox"> + ${h.checkbox('hooks_pretxnchangegroup_push_logger','True')} + <label for="hooks_pretxnchangegroup_push_logger">${_('Log user push commands')}</label> + </div> + <div class="checkbox"> + ${h.checkbox('hooks_preoutgoing_pull_logger','True')} + <label for="hooks_preoutgoing_pull_logger">${_('Log user pull commands')}</label> + </div> </div> </div>