Prepend current organizer to typeahead

This commit is contained in:
Martin Gross
2019-05-28 12:29:54 +02:00
parent 9eef5d5d6d
commit b3436c1a93
3 changed files with 12 additions and 2 deletions

View File

@@ -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"

View File

@@ -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': {

View File

@@ -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) {