From 780414ab70776811574a907babfe5fb516d7628f Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Tue, 17 Jul 2018 16:51:46 +0200
Subject: [PATCH] name of the worker is in API response
---
smash/web/api_views/worker.py | 1 +
smash/web/static/js/smash.js | 7 +++----
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/smash/web/api_views/worker.py b/smash/web/api_views/worker.py
index 881f1528..39eb016e 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 f2af5cef..69a2961b 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>');
});
});
});
--
GitLab