mirror of
https://github.com/pretix/pretix.git
synced 2026-05-03 14:54:04 +00:00
Prepend current organizer to typeahead
This commit is contained in:
@@ -242,7 +242,10 @@
|
|||||||
<span class="caret"></span></a>
|
<span class="caret"></span></a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<ul class="dropdown-menu event-dropdown" role="menu" data-event-typeahead
|
<ul class="dropdown-menu event-dropdown" role="menu" data-event-typeahead
|
||||||
data-source="{% url "control:nav.typeahead" %}">
|
data-source="{% url "control:nav.typeahead" %}"
|
||||||
|
{% if request.event %}
|
||||||
|
data-organizer="{{ request.organizer.id }}"
|
||||||
|
{% endif %}>
|
||||||
<li class="query-holder">
|
<li class="query-holder">
|
||||||
<div class="form-box">
|
<div class="form-box">
|
||||||
<input type="text" class="form-control" id="event-dropdown-field"
|
<input type="text" class="form-control" id="event-dropdown-field"
|
||||||
|
|||||||
@@ -107,6 +107,8 @@ def event_list(request):
|
|||||||
|
|
||||||
def nav_context_list(request):
|
def nav_context_list(request):
|
||||||
query = request.GET.get('query', '')
|
query = request.GET.get('query', '')
|
||||||
|
organizer = request.GET.get('organizer', None)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
page = int(request.GET.get('page', '1'))
|
page = int(request.GET.get('page', '1'))
|
||||||
except ValueError:
|
except ValueError:
|
||||||
@@ -145,6 +147,11 @@ def nav_context_list(request):
|
|||||||
] + [
|
] + [
|
||||||
serialize_event(e) for e in qs_events.select_related('organizer')[offset:offset + (pagesize if query else 5)]
|
serialize_event(e) for e in qs_events.select_related('organizer')[offset:offset + (pagesize if query else 5)]
|
||||||
]
|
]
|
||||||
|
|
||||||
|
if show_user and organizer:
|
||||||
|
organizer = serialize_orga(Organizer.objects.get(pk=organizer))
|
||||||
|
results.insert(1, results.pop(results.index(organizer)) if results.index(organizer) else organizer)
|
||||||
|
|
||||||
doc = {
|
doc = {
|
||||||
'results': results,
|
'results': results,
|
||||||
'pagination': {
|
'pagination': {
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ $(function () {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
$.getJSON(
|
$.getJSON(
|
||||||
$container.attr("data-source") + "?query=" + encodeURIComponent($query.val()),
|
$container.attr("data-source") + "?query=" + encodeURIComponent($query.val()) + (typeof $container.attr("data-organizer") !== "undefined" ? "&organizer=" + $container.attr("data-organizer") : ""),
|
||||||
function (data) {
|
function (data) {
|
||||||
$container.find("li:not(.query-holder)").remove();
|
$container.find("li:not(.query-holder)").remove();
|
||||||
$.each(data.results, function (i, res) {
|
$.each(data.results, function (i, res) {
|
||||||
|
|||||||
Reference in New Issue
Block a user