Change link variable name to avoid import conflicts
This commit is contained in:
@@ -2,6 +2,6 @@ from __future__ import absolute_import
|
||||
|
||||
from project_tools.api import register_tool
|
||||
|
||||
from .links import statistics
|
||||
from .links import statistics_link
|
||||
|
||||
register_tool(statistics)
|
||||
register_tool(statistics_link)
|
||||
|
||||
@@ -8,4 +8,5 @@ from navigation.api import Link
|
||||
def is_superuser(context):
|
||||
return context['request'].user.is_staff or context['request'].user.is_superuser
|
||||
|
||||
statistics = Link(text=_(u'statistics'), view='statistics', sprite='table', icon='blackboard_sum.png', condition=is_superuser, children_view_regex=[r'statistics'])
|
||||
|
||||
statistics_link = Link(text=_(u'statistics'), view='statistics', sprite='table', icon='blackboard_sum.png', condition=is_superuser, children_view_regex=[r'statistics'])
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
from django.conf.urls.defaults import patterns, url
|
||||
|
||||
urlpatterns = patterns('statistics.views',
|
||||
url(r'^$', 'statistics', (), 'statistics'),
|
||||
url(r'^$', 'statistics_view', (), 'statistics'),
|
||||
)
|
||||
|
||||
@@ -7,10 +7,8 @@ from django.utils.translation import ugettext_lazy as _
|
||||
from documents.statistics import get_statistics as documents_statistics
|
||||
from ocr.statistics import get_statistics as ocr_statistics
|
||||
|
||||
from .api import diagnostics, tools
|
||||
|
||||
|
||||
def statistics(request):
|
||||
def statistics_view(request):
|
||||
if request.user.is_superuser or request.user.is_staff:
|
||||
blocks = []
|
||||
blocks.append(documents_statistics())
|
||||
|
||||
Reference in New Issue
Block a user