From b3436c1a933c9182a96641f02b8a4d493427af3e Mon Sep 17 00:00:00 2001
From: Martin Gross <gross@rami.io>
Date: Tue, 28 May 2019 12:29:54 +0200
Subject: [PATCH] Prepend current organizer to typeahead

---
 src/pretix/control/templates/pretixcontrol/base.html | 5 ++++-
 src/pretix/control/views/typeahead.py                | 7 +++++++
 src/pretix/static/pretixcontrol/js/ui/typeahead.js   | 2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/pretix/control/templates/pretixcontrol/base.html b/src/pretix/control/templates/pretixcontrol/base.html
index 4ea3a50aa..b299285e0 100644
--- a/src/pretix/control/templates/pretixcontrol/base.html
+++ b/src/pretix/control/templates/pretixcontrol/base.html
@@ -242,7 +242,10 @@
                                     <span class="caret"></span></a>
                             {% endif %}
                             <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">
                                     <div class="form-box">
                                         <input type="text" class="form-control" id="event-dropdown-field"
diff --git a/src/pretix/control/views/typeahead.py b/src/pretix/control/views/typeahead.py
index 10f6a4da8..1f025c074 100644
--- a/src/pretix/control/views/typeahead.py
+++ b/src/pretix/control/views/typeahead.py
@@ -107,6 +107,8 @@ def event_list(request):
 
 def nav_context_list(request):
     query = request.GET.get('query', '')
+    organizer = request.GET.get('organizer', None)
+
     try:
         page = int(request.GET.get('page', '1'))
     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)]
     ]
+
+    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 = {
         'results': results,
         'pagination': {
diff --git a/src/pretix/static/pretixcontrol/js/ui/typeahead.js b/src/pretix/static/pretixcontrol/js/ui/typeahead.js
index 64412122a..9e480353a 100644
--- a/src/pretix/static/pretixcontrol/js/ui/typeahead.js
+++ b/src/pretix/static/pretixcontrol/js/ui/typeahead.js
@@ -19,7 +19,7 @@ $(function () {
                 return;
             }
             $.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) {
                     $container.find("li:not(.query-holder)").remove();
                     $.each(data.results, function (i, res) {