From ff213800995890d9596bc1f48af4571a2c90ab1f Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Thu, 24 Aug 2017 14:21:30 +0200 Subject: [PATCH] Improve typeahead on dashboard page --- src/pretix/control/views/dashboards.py | 2 +- src/pretix/static/pretixcontrol/js/ui/typeahead.js | 5 +++++ src/pretix/static/pretixcontrol/scss/_dashboard.scss | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/pretix/control/views/dashboards.py b/src/pretix/control/views/dashboards.py index 70b67c8b0..ef6f91af3 100644 --- a/src/pretix/control/views/dashboards.py +++ b/src/pretix/control/views/dashboards.py @@ -230,7 +230,7 @@ def welcome_wizard_widget(sender, **kwargs): def event_index(request, organizer, event): widgets = [] - for r, result in event_dashboard_widgets.send(sender=request.event): + for r, result in event_dashboard_widgets.send(sender=request.event, request=request): widgets.extend(result) can_change_orders = request.user.has_event_permission(request.organizer, request.event, 'can_change_orders') diff --git a/src/pretix/static/pretixcontrol/js/ui/typeahead.js b/src/pretix/static/pretixcontrol/js/ui/typeahead.js index 5552cbc89..82ea1d2f5 100644 --- a/src/pretix/static/pretixcontrol/js/ui/typeahead.js +++ b/src/pretix/static/pretixcontrol/js/ui/typeahead.js @@ -13,6 +13,11 @@ $(function () { $container.find("li:not(.query-holder)").remove(); $query.on("change", function () { + if ($container.attr("data-typeahead-field") && $query.val() === "") { + $container.removeClass('focused'); + $container.find("li:not(.query-holder)").remove(); + return; + } $.getJSON( $container.attr("data-source") + "?query=" + encodeURIComponent($query.val()), function (data) { diff --git a/src/pretix/static/pretixcontrol/scss/_dashboard.scss b/src/pretix/static/pretixcontrol/scss/_dashboard.scss index 8f903cca6..4865d1bd0 100644 --- a/src/pretix/static/pretixcontrol/scss/_dashboard.scss +++ b/src/pretix/static/pretixcontrol/scss/_dashboard.scss @@ -156,6 +156,10 @@ .focused.dropdown-menu { display: block; + overflow: hidden; + } + .event-dropdown .event-name-full, .mobile-event-dropdown .event-name-full { + white-space: normal; } }