From 078d9996e4ecfb90d0b4a2f178a7b36093115e19 Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Tue, 15 Nov 2016 00:16:24 +0100 Subject: [PATCH] system-info: add edition type into app info. --- rhodecode/controllers/admin/settings.py | 2 +- rhodecode/lib/system_info.py | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/rhodecode/controllers/admin/settings.py b/rhodecode/controllers/admin/settings.py index a372a31b..8be791ba 100644 --- a/rhodecode/controllers/admin/settings.py +++ b/rhodecode/controllers/admin/settings.py @@ -577,7 +577,7 @@ class SettingsController(BaseController): ), ''), # RhodeCode specific - (_('RhodeCode Version'), c.rhodecode_version, ''), + (_('RhodeCode Version'), val('rhodecode_app')['text'], state('rhodecode_app')), (_('RhodeCode Server IP'), val('server')['server_ip'], state('server')), (_('RhodeCode Server ID'), val('server')['server_id'], state('server')), (_('RhodeCode Configuration'), val('rhodecode_config')['path'], state('rhodecode_config')), diff --git a/rhodecode/lib/system_info.py b/rhodecode/lib/system_info.py index 6cb00c9e..c8f7dde7 100644 --- a/rhodecode/lib/system_info.py +++ b/rhodecode/lib/system_info.py @@ -466,11 +466,18 @@ def vcs_server(): def rhodecode_app_info(): import rhodecode + edition = rhodecode.CONFIG.get('rhodecode.edition') + value = dict( rhodecode_version=rhodecode.__version__, - rhodecode_lib_path=os.path.abspath(rhodecode.__file__) + rhodecode_lib_path=os.path.abspath(rhodecode.__file__), + text='' ) - return SysInfoRes(value=value) + human_value = value.copy() + human_value['text'] = 'RhodeCode {edition}, version {ver}'.format( + edition=edition, ver=value['rhodecode_version'] + ) + return SysInfoRes(value=value, human_value=human_value) def rhodecode_config():