# HG changeset patch # User Marcin Kuzminski # Date 1369775551 -7200 # Node ID 36f7562a59199d6301a6d7da1f056a8b66fcd657 # Parent e87298ccdfdbf8485b81751a4e430535ac10ad3d Implements #842 RhodeCode version disclosure. - it's now implemented as visual option in settings diff -r e87298ccdfdb -r 36f7562a5919 rhodecode/controllers/admin/settings.py --- 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'), diff -r e87298ccdfdb -r 36f7562a5919 rhodecode/lib/base.py --- 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')) diff -r e87298ccdfdb -r 36f7562a5919 rhodecode/lib/db_manage.py --- 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) diff -r e87298ccdfdb -r 36f7562a5919 rhodecode/model/forms.py --- 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 diff -r e87298ccdfdb -r 36f7562a5919 rhodecode/templates/admin/settings/settings.html --- 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 @@ ${_('Allows storing additional customized fields per repository.')} +
+ ${h.checkbox('rhodecode_show_version','True')} + +
+ ${_('Shows or hides displayed version of RhodeCode in the footer')}
diff -r e87298ccdfdb -r 36f7562a5919 rhodecode/templates/base/base.html --- 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 ''}