Mercurial > kallithea
diff rhodecode/controllers/admin/settings.py @ 2257:a437a986d399
merged beta into stable
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Thu, 10 May 2012 20:27:45 +0200 |
parents | ecd59c28f432 528f987f2459 |
children | 63e58ef80ef1 |
line wrap: on
line diff
--- a/rhodecode/controllers/admin/settings.py Mon Apr 23 18:31:51 2012 +0200 +++ b/rhodecode/controllers/admin/settings.py Thu May 10 20:27:45 2012 +0200 @@ -26,6 +26,8 @@ import logging import traceback import formencode +import pkg_resources +import platform from sqlalchemy import func from formencode import htmlfill @@ -64,6 +66,11 @@ def __before__(self): c.admin_user = session.get('admin_user') c.admin_username = session.get('admin_username') + c.modules = sorted([(p.project_name, p.version) + for p in pkg_resources.working_set], + key=lambda k: k[0].lower()) + c.py_version = platform.python_version() + c.platform = platform.platform() super(SettingsController, self).__before__() @HasPermissionAllDecorator('hg.admin') @@ -73,6 +80,7 @@ defaults = RhodeCodeSetting.get_app_settings() defaults.update(self.get_hg_ui_settings()) + return htmlfill.render( render('admin/settings/settings.html'), defaults=defaults,