diff --git a/smash/web/api_views/worker.py b/smash/web/api_views/worker.py index 881f15287d969ffaea7a1fb6b58fdb1f23ca78ca..39eb016eead7bbde9c4478276c82f27e39fd50cf 100644 --- a/smash/web/api_views/worker.py +++ b/smash/web/api_views/worker.py @@ -82,6 +82,7 @@ def serialize_worker(worker): result = { "first_name": worker.first_name, "last_name": worker.last_name, + "name": str(worker), "id": worker.id, } return result diff --git a/smash/web/static/js/smash.js b/smash/web/static/js/smash.js index f2af5cef26d8c4b20f2d93c4530785fdf9a57f5e..69a2961b00841a9f2205abf4697a414995d750b0 100644 --- a/smash/web/static/js/smash.js +++ b/smash/web/static/js/smash.js @@ -24,9 +24,9 @@ $(document).ready(function () { return true; } }); - + //disable all dropdown HTML select elements that should be readonly but aren't - $("select[readonly] option:not(:selected)").attr('disabled','disabled'); + $("select[readonly] option:not(:selected)").attr('disabled', 'disabled'); }); $.ajaxSetup({ @@ -295,8 +295,7 @@ function createTable(params) { var select = $('select', obj); $.get(voucher_partner_url, function (content) { $.each(content.data, function (index, voucher_partner) { - select.append('<option value="' + voucher_partner.id + '">' + voucher_partner.first_name + ' ' + - voucher_partner.last_name + ' ' + '</option>'); + select.append('<option value="' + voucher_partner.id + '">' + voucher_partner.name + '</option>'); }); }); });