matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move favicon redirect code from common.urls to common.views as

Browse Source 
FaviconRedirectView. This removed the
django.contrib.staticfiles.templatetags.staticfiles.static URL runtime
computation from common.urls. GitLab issue #340.

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2017-03-07 00:43:32 -04:00
parent 85cb1a0f71
commit 7a4a78c2ca
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mayan/apps/common/urls.py
View File

@@ -1,16 +1,14 @@
from __future__ import unicode_literals
from django.conf.urls import url
from django.contrib.staticfiles.templatetags.staticfiles import static
from django.views.generic import RedirectView
from django.views.i18n import javascript_catalog, set_language
from api_views import APIContentTypeList
from .api_views import APIContentTypeList
from .views import (
AboutView, CurrentUserDetailsView, CurrentUserEditView,
CurrentUserLocaleProfileDetailsView, CurrentUserLocaleProfileEditView,
FilterResultListView, FilterSelectView, HomeView, LicenseView,
PackagesLicensesView, SetupListView, ToolsListView,
FaviconRedirectView, FilterResultListView, FilterSelectView, HomeView,
LicenseView, PackagesLicensesView, SetupListView, ToolsListView,
multi_object_action_view
)
@@ -56,9 +54,7 @@ urlpatterns = [
urlpatterns += [
url(
r'^favicon\.ico$', RedirectView.as_view(
permanent=True, url=static('appearance/images/favicon.ico')
)
r'^favicon\.ico$', FaviconRedirectView.as_view()
),
url(
r'^jsi18n/(?P<packages>\S+?)/$', javascript_catalog,

8
mayan/apps/common/views.py
View File

@@ -4,13 +4,14 @@ from json import dumps
from django.conf import settings
from django.contrib import messages
from django.contrib.staticfiles.templatetags.staticfiles import static
from django.core.urlresolvers import reverse, reverse_lazy
from django.http import Http404, HttpResponseRedirect
from django.template import RequestContext
from django.utils import timezone, translation
from django.utils.http import urlencode
from django.utils.translation import ugettext_lazy as _, ugettext
from django.views.generic import TemplateView
from django.views.generic import RedirectView, TemplateView
from .classes import Filter
from .forms import (
@@ -106,6 +107,11 @@ class CurrentUserLocaleProfileEditView(SingleObjectEditView):
return self.request.user.locale_profile
class FaviconRedirectView(RedirectView):
permanent=True
url=static('appearance/images/favicon.ico')
class FilterSelectView(SimpleView):
form_class = FilterForm
template_name = 'appearance/generic_form.html'