diff --git a/rhodecode/apps/admin/views/system_info.py b/rhodecode/apps/admin/views/system_info.py --- a/rhodecode/apps/admin/views/system_info.py +++ b/rhodecode/apps/admin/views/system_info.py @@ -165,16 +165,20 @@ class AdminSystemInfoSettingsView(BaseAp (_('Storage location'), val('storage')['path'], state('storage')), (_('Storage info'), val('storage')['text'], state('storage')), (_('Storage inodes'), val('storage_inodes')['text'], state('storage_inodes')), + ('', '', ''), # spacer (_('Gist storage location'), val('storage_gist')['path'], state('storage_gist')), (_('Gist storage info'), val('storage_gist')['text'], state('storage_gist')), + ('', '', ''), # spacer (_('Archive cache storage type'), val('storage_archive')['type'], state('storage_archive')), (_('Archive cache storage location'), val('storage_archive')['path'], state('storage_archive')), (_('Archive cache info'), val('storage_archive')['text'], state('storage_archive')), + ('', '', ''), # spacer (_('Temp storage location'), val('storage_temp')['path'], state('storage_temp')), (_('Temp storage info'), val('storage_temp')['text'], state('storage_temp')), + ('', '', ''), # spacer (_('Search info'), val('search')['text'], state('search')), (_('Search location'), val('search')['location'], state('search')), @@ -190,7 +194,7 @@ class AdminSystemInfoSettingsView(BaseAp ] c.vcsserver_data_items = [ - (k, v) for k,v in (val('vcs_server_config') or {}).items() + (k, v) for k, v in (val('vcs_server_config') or {}).items() ] if snapshot: @@ -210,7 +214,8 @@ class AdminSystemInfoSettingsView(BaseAp update_url = UpdateModel().get_update_url() def _err(s): - return '
{}
'.format(s) + return f'
{s}
' + try: data = UpdateModel().get_update_data(update_url) except urllib.error.URLError as e: @@ -226,12 +231,12 @@ class AdminSystemInfoSettingsView(BaseAp c.update_url = update_url c.latest_data = latest - c.latest_ver = latest['version'] - c.cur_ver = rhodecode.__version__ + c.latest_ver = (latest['version'] or '').strip() + c.cur_ver = self.request.GET.get('ver') or rhodecode.__version__ c.should_upgrade = False - is_oudated = UpdateModel().is_outdated(c.cur_ver, c.latest_ver) - if is_oudated: + is_outdated = UpdateModel().is_outdated(c.cur_ver, c.latest_ver) + if is_outdated: c.should_upgrade = True c.important_notices = latest['general'] UpdateModel().store_version(latest['version'])