Merge branch 'hotfix/no_hard_coded_admin_sentry' into development

This commit is contained in:
Roberto Rosario
2011-10-30 19:54:46 -04:00

View File

@@ -15,15 +15,15 @@ def is_superuser(context):
maintenance_menu = {'text': _(u'maintenance'), 'view': 'maintenance_menu', 'famfam': 'wrench', 'icon': 'wrench.png'}
statistics = {'text': _(u'statistics'), 'view': 'statistics', 'famfam': 'table', 'icon': 'blackboard_sum.png'}
diagnostics = {'text': _(u'diagnostics'), 'view': 'diagnostics', 'famfam': 'pill', 'icon': 'pill.png'}
sentry = {'text': _(u'sentry'), 'url': '/sentry', 'famfam': 'bug', 'icon': 'bug.png', 'condition': is_superuser}
admin_site = {'text': _(u'admin site'), 'url': '/admin', 'famfam': 'keyboard', 'icon': 'keyboard.png', 'condition': is_superuser}
sentry = {'text': _(u'sentry'), 'view': 'sentry', 'famfam': 'bug', 'icon': 'bug.png', 'condition': is_superuser}
admin_site = {'text': _(u'admin site'), 'view': 'admin:index', 'famfam': 'keyboard', 'icon': 'keyboard.png', 'condition': is_superuser}
__version_info__ = {
'major': 0,
'minor': 8,
'micro': 3,
'releaselevel': 'final',
'serial': 0
'releaselevel': 'hotfix',
'serial': 2
}
if not DISABLE_HOME_VIEW: