Mercurial > kallithea
changeset 3910:36f7562a5919 beta
Implements #842 RhodeCode version disclosure.
- it's now implemented as visual option in settings
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Tue, 28 May 2013 23:12:31 +0200 |
| parents | e87298ccdfdb |
| children | 7cca0d07c12b |
| files | rhodecode/controllers/admin/settings.py rhodecode/lib/base.py rhodecode/lib/db_manage.py rhodecode/model/forms.py rhodecode/templates/admin/settings/settings.html rhodecode/templates/base/base.html |
| diffstat | 6 files changed, 20 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/admin/settings.py Tue May 28 23:02:02 2013 +0200 +++ b/rhodecode/controllers/admin/settings.py Tue May 28 23:12:31 2013 +0200 @@ -209,6 +209,11 @@ form_result['rhodecode_dashboard_items'] Session().add(sett5) + sett6 = RhodeCodeSetting.get_by_name_or_create('show_version') + sett6.app_settings_value = \ + form_result['rhodecode_show_version'] + Session().add(sett6) + Session().commit() set_rhodecode_config(config) h.flash(_('Updated visualisation settings'),
--- a/rhodecode/lib/base.py Tue May 28 23:02:02 2013 +0200 +++ b/rhodecode/lib/base.py Tue May 28 23:12:31 2013 +0200 @@ -273,6 +273,8 @@ c.visual.stylify_metatags = str2bool(rc_config.get('rhodecode_stylify_metatags')) c.visual.dashboard_items = safe_int(rc_config.get('rhodecode_dashboard_items', 100)) c.visual.repository_fields = str2bool(rc_config.get('rhodecode_repository_fields')) + c.visual.show_version = str2bool(rc_config.get('rhodecode_show_version')) + ## INI stored self.cut_off_limit = int(config.get('cut_off_limit'))
--- a/rhodecode/lib/db_manage.py Tue May 28 23:02:02 2013 +0200 +++ b/rhodecode/lib/db_manage.py Tue May 28 23:12:31 2013 +0200 @@ -659,6 +659,7 @@ ('show_private_icon', True, bool), ('stylify_metatags', False, bool), ('dashboard_items', 100, int), + ('show_version', True, bool) ] for key, val, type_ in settings: sett = RhodeCodeSetting(key, val)
--- a/rhodecode/model/forms.py Tue May 28 23:02:02 2013 +0200 +++ b/rhodecode/model/forms.py Tue May 28 23:12:31 2013 +0200 @@ -286,6 +286,7 @@ rhodecode_repository_fields = v.StringBoolean(if_missing=False) rhodecode_lightweight_journal = v.StringBoolean(if_missing=False) rhodecode_dashboard_items = v.UnicodeString() + rhodecode_show_version = v.StringBoolean(if_missing=False) return _ApplicationVisualisationForm
--- a/rhodecode/templates/admin/settings/settings.html Tue May 28 23:02:02 2013 +0200 +++ b/rhodecode/templates/admin/settings/settings.html Tue May 28 23:12:31 2013 +0200 @@ -134,6 +134,11 @@ <label for="rhodecode_repository_fields">${_('Use repository extra fields')}</label> </div> <span class="help-block">${_('Allows storing additional customized fields per repository.')}</span> + <div class="checkbox"> + ${h.checkbox('rhodecode_show_version','True')} + <label for="rhodecode_show_version">${_('Show RhodeCode version')}</label> + </div> + <span class="help-block">${_('Shows or hides displayed version of RhodeCode in the footer')}</span> </div> </div> <div class="field">
--- a/rhodecode/templates/base/base.html Tue May 28 23:02:02 2013 +0200 +++ b/rhodecode/templates/base/base.html Tue May 28 23:12:31 2013 +0200 @@ -42,7 +42,12 @@ ${_('Server instance: %s') % c.rhodecode_instanceid if c.rhodecode_instanceid else ''} </p> <p class="footer-link-right"> - <a href="${h.url('rhodecode_official')}">RhodeCode ${c.rhodecode_version}</a> + <a href="${h.url('rhodecode_official')}"> + RhodeCode + %if c.visual.show_version: + ${c.rhodecode_version} + %endif + </a> © 2010-${h.datetime.today().year} by Marcin Kuzminski and others – <a href="${h.url('bugtracker')}">${_('Report a bug')}</a> </p>