From 54d836ba07939953d213257121ae66264aae7574 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 27 Jul 2012 01:19:13 -0400 Subject: [PATCH] Change link variable name to avoid import conflicts --- apps/statistics/__init__.py | 4 ++-- apps/statistics/links.py | 3 ++- apps/statistics/urls.py | 2 +- apps/statistics/views.py | 4 +--- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/apps/statistics/__init__.py b/apps/statistics/__init__.py index 1da53fbed2..128bad6ffb 100644 --- a/apps/statistics/__init__.py +++ b/apps/statistics/__init__.py @@ -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) diff --git a/apps/statistics/links.py b/apps/statistics/links.py index 980956bc54..b18372d914 100644 --- a/apps/statistics/links.py +++ b/apps/statistics/links.py @@ -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']) diff --git a/apps/statistics/urls.py b/apps/statistics/urls.py index 6ad39704e6..7c0521811f 100644 --- a/apps/statistics/urls.py +++ b/apps/statistics/urls.py @@ -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'), ) diff --git a/apps/statistics/views.py b/apps/statistics/views.py index 8c2cde193d..efb0417016 100644 --- a/apps/statistics/views.py +++ b/apps/statistics/views.py @@ -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())