CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-05 15:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #782 -- Select2 widget for item selection for vouchers

Browse Source
This commit is contained in:
Raphael Michel
2018-04-03 12:10:34 +02:00
parent 7ec5adb6b4
commit bb10d25561
6 changed files with 163 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/pretix/static/pretixcontrol/js/ui/main.js
View File

@@ -281,7 +281,23 @@ var form_handlers = function (el) {
page: params.page || 1
}
}
}
},
templateResult: function (res) {
if (!res.id) {
return res.text;
}
var $ret = $("<span>").append(
$("<span>").addClass("primary").append($("<div>").text(res.text).html())
);
if (res.event) {
$ret.append(
$("<span>").addClass("secondary").append(
$("<span>").addClass("fa fa-calendar fa-fw")
).append(" ").append($("<div>").text(res.event).html())
);
}
return $ret;
},
}).on("select2:select", function () {
// Allow continuing to select
if ($s.hasAttribute("multiple")) {

5
src/pretix/static/pretixcontrol/scss/main.scss
View File

@@ -322,16 +322,17 @@ body.loading #wrapper {
width: 300px;
}
.event-dropdown, .mobile-event-dropdown, .select2-results {
.event-name-full {
.event-name-full, .primary {
display: block;
}
.event-daterange, .event-organizer {
.event-daterange, .event-organizer, .secondary {
display: block;
font-size: $font-size-small;
color: $text-muted;
}
.active .event-daterange, .active .event-organizer, .active a,
.select2-results__option--highlighted .event-daterange,
.select2-results__option--highlighted .secondary,
.select2-results__option--highlighted .event-organizer {
color: white;
}