forked from CGM_Public/pretix_original
Try to make pretix compatible with SCRIPT_NAME
Remove unnecessary resolve() calls
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.core.urlresolvers import resolve
|
from django.core.urlresolvers import resolve, get_script_prefix
|
||||||
from .signals import html_head, nav_event
|
from .signals import html_head, nav_event
|
||||||
|
|
||||||
|
|
||||||
@@ -8,7 +8,7 @@ def contextprocessor(request):
|
|||||||
Adds data to all template contexts
|
Adds data to all template contexts
|
||||||
"""
|
"""
|
||||||
url = resolve(request.path_info)
|
url = resolve(request.path_info)
|
||||||
if not request.path.startswith('/control'):
|
if not request.path.startswith(get_script_prefix() + 'control'):
|
||||||
return {}
|
return {}
|
||||||
ctx = {
|
ctx = {
|
||||||
'url_name': url.url_name,
|
'url_name': url.url_name,
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
|
from urllib.parse import urlparse
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.core.urlresolvers import resolve
|
from django.core.urlresolvers import resolve, get_script_prefix
|
||||||
from django.utils.encoding import force_str
|
from django.utils.encoding import force_str
|
||||||
from django.utils.six.moves.urllib.parse import urlparse
|
|
||||||
from django.shortcuts import resolve_url
|
from django.shortcuts import resolve_url
|
||||||
from django.contrib.auth import REDIRECT_FIELD_NAME
|
from django.contrib.auth import REDIRECT_FIELD_NAME
|
||||||
from django.http import HttpResponseNotFound
|
from django.http import HttpResponseNotFound
|
||||||
@@ -25,7 +25,7 @@ class PermissionMiddleware:
|
|||||||
def process_request(self, request):
|
def process_request(self, request):
|
||||||
url = resolve(request.path_info)
|
url = resolve(request.path_info)
|
||||||
url_name = url.url_name
|
url_name = url.url_name
|
||||||
if not request.path.startswith('/control') or url_name in self.EXCEPTIONS:
|
if not request.path.startswith(get_script_prefix() + 'control') or url_name in self.EXCEPTIONS:
|
||||||
return
|
return
|
||||||
if not request.user.is_authenticated():
|
if not request.user.is_authenticated():
|
||||||
# Taken from django/contrib/auth/decorators.py
|
# Taken from django/contrib/auth/decorators.py
|
||||||
|
|||||||
@@ -52,9 +52,8 @@ class CategoryDelete(EventPermissionRequiredMixin, DeleteView):
|
|||||||
context_object_name = 'category'
|
context_object_name = 'category'
|
||||||
|
|
||||||
def get_object(self, queryset=None) -> ItemCategory:
|
def get_object(self, queryset=None) -> ItemCategory:
|
||||||
url = resolve(self.request.path_info)
|
|
||||||
return self.request.event.categories.current.get(
|
return self.request.event.categories.current.get(
|
||||||
identity=url.kwargs['category']
|
identity=self.kwargs['category']
|
||||||
)
|
)
|
||||||
|
|
||||||
def delete(self, request, *args, **kwargs):
|
def delete(self, request, *args, **kwargs):
|
||||||
@@ -199,17 +198,15 @@ class PropertyUpdate(EventPermissionRequiredMixin, UpdateView):
|
|||||||
context_object_name = 'property'
|
context_object_name = 'property'
|
||||||
|
|
||||||
def get_object(self, queryset=None) -> Property:
|
def get_object(self, queryset=None) -> Property:
|
||||||
url = resolve(self.request.path_info)
|
|
||||||
return self.request.event.properties.current.get(
|
return self.request.event.properties.current.get(
|
||||||
identity=url.kwargs['property']
|
identity=self.kwargs['property']
|
||||||
)
|
)
|
||||||
|
|
||||||
def get_success_url(self) -> str:
|
def get_success_url(self) -> str:
|
||||||
url = resolve(self.request.path_info)
|
|
||||||
return reverse('control:event.items.properties.edit', kwargs={
|
return reverse('control:event.items.properties.edit', kwargs={
|
||||||
'organizer': self.request.event.organizer.slug,
|
'organizer': self.request.event.organizer.slug,
|
||||||
'event': self.request.event.slug,
|
'event': self.request.event.slug,
|
||||||
'property': url.kwargs['property']
|
'property': self.kwargs['property']
|
||||||
}) + '?success=true'
|
}) + '?success=true'
|
||||||
|
|
||||||
def get_formset(self):
|
def get_formset(self):
|
||||||
@@ -322,9 +319,8 @@ class PropertyDelete(EventPermissionRequiredMixin, DeleteView):
|
|||||||
|
|
||||||
def get_object(self, queryset=None) -> Property:
|
def get_object(self, queryset=None) -> Property:
|
||||||
if not hasattr(self, 'object') or not self.object:
|
if not hasattr(self, 'object') or not self.object:
|
||||||
url = resolve(self.request.path_info)
|
|
||||||
self.object = self.request.event.properties.current.get(
|
self.object = self.request.event.properties.current.get(
|
||||||
identity=url.kwargs['property']
|
identity=self.kwargs['property']
|
||||||
)
|
)
|
||||||
return self.object
|
return self.object
|
||||||
|
|
||||||
@@ -371,9 +367,8 @@ class QuestionDelete(EventPermissionRequiredMixin, DeleteView):
|
|||||||
context_object_name = 'question'
|
context_object_name = 'question'
|
||||||
|
|
||||||
def get_object(self, queryset=None) -> Question:
|
def get_object(self, queryset=None) -> Question:
|
||||||
url = resolve(self.request.path_info)
|
|
||||||
return self.request.event.questions.current.get(
|
return self.request.event.questions.current.get(
|
||||||
identity=url.kwargs['question']
|
identity=self.kwargs['question']
|
||||||
)
|
)
|
||||||
|
|
||||||
def get_context_data(self, *args, **kwargs) -> dict:
|
def get_context_data(self, *args, **kwargs) -> dict:
|
||||||
@@ -402,9 +397,8 @@ class QuestionUpdate(EventPermissionRequiredMixin, UpdateView):
|
|||||||
context_object_name = 'question'
|
context_object_name = 'question'
|
||||||
|
|
||||||
def get_object(self, queryset=None) -> Question:
|
def get_object(self, queryset=None) -> Question:
|
||||||
url = resolve(self.request.path_info)
|
|
||||||
return self.request.event.questions.current.get(
|
return self.request.event.questions.current.get(
|
||||||
identity=url.kwargs['question']
|
identity=self.kwargs['question']
|
||||||
)
|
)
|
||||||
|
|
||||||
def get_success_url(self) -> str:
|
def get_success_url(self) -> str:
|
||||||
@@ -559,9 +553,8 @@ class QuotaUpdate(EventPermissionRequiredMixin, QuotaEditorMixin, UpdateView):
|
|||||||
context_object_name = 'quota'
|
context_object_name = 'quota'
|
||||||
|
|
||||||
def get_object(self, queryset=None) -> Quota:
|
def get_object(self, queryset=None) -> Quota:
|
||||||
url = resolve(self.request.path_info)
|
|
||||||
return self.request.event.quotas.current.get(
|
return self.request.event.quotas.current.get(
|
||||||
identity=url.kwargs['quota']
|
identity=self.kwargs['quota']
|
||||||
)
|
)
|
||||||
|
|
||||||
def get_success_url(self) -> str:
|
def get_success_url(self) -> str:
|
||||||
@@ -578,9 +571,8 @@ class QuotaDelete(EventPermissionRequiredMixin, DeleteView):
|
|||||||
context_object_name = 'quota'
|
context_object_name = 'quota'
|
||||||
|
|
||||||
def get_object(self, queryset=None) -> Quota:
|
def get_object(self, queryset=None) -> Quota:
|
||||||
url = resolve(self.request.path_info)
|
|
||||||
return self.request.event.quotas.current.get(
|
return self.request.event.quotas.current.get(
|
||||||
identity=url.kwargs['quota']
|
identity=self.kwargs['quota']
|
||||||
)
|
)
|
||||||
|
|
||||||
def get_context_data(self, *args, **kwargs) -> dict:
|
def get_context_data(self, *args, **kwargs) -> dict:
|
||||||
@@ -607,9 +599,8 @@ class ItemDetailMixin(SingleObjectMixin):
|
|||||||
|
|
||||||
def get_object(self, queryset=None) -> Item:
|
def get_object(self, queryset=None) -> Item:
|
||||||
if not hasattr(self, 'object') or not self.object:
|
if not hasattr(self, 'object') or not self.object:
|
||||||
url = resolve(self.request.path_info)
|
|
||||||
self.item = self.request.event.items.current.get(
|
self.item = self.request.event.items.current.get(
|
||||||
identity=url.kwargs['item']
|
identity=self.kwargs['item']
|
||||||
)
|
)
|
||||||
self.object = self.item
|
self.object = self.item
|
||||||
return self.object
|
return self.object
|
||||||
|
|||||||
Reference in New Issue
Block a user