lfk/frontend
2
0
Fork 0
Code Issues 3 Pull Requests Actions Projects Releases Wiki Activity

Fix for bug discovered by @philipp

Browse Source 
ref #92
This commit is contained in:
Nicolai Ort 2021-03-18 18:32:08 +01:00
parent 0ae3d36f0c
commit d28a0e1dbb
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/scans/ScanDetail.svelte
View File

@ -29,13 +29,14 @@
(data) => { (data) => {
data_loaded = true; data_loaded = true;
original_data = Object.assign(original_data, data); original_data = Object.assign(original_data, data);
original_data.runner = original_data.runner.id;
editable = Object.assign(editable, original_data); editable = Object.assign(editable, original_data);
RunnerService.runnerControllerGetAll().then( RunnerService.runnerControllerGetAll().then(
(val) => { (val) => {
current_runners = val.map((r) => { current_runners = val.map((r) => {
return { label: getRunnerLabel(r), value: r }; return { label: getRunnerLabel(r), value: r };
}); });
runner = current_runners.find(r => r.value.id == editable.runner.id); runner = current_runners.find(r => r.value.id == editable.runner);
} }
); );
} }
@ -55,7 +56,6 @@
let postdata = {}; let postdata = {};
if (original_data.responseType === "TRACKSCAN") { if (original_data.responseType === "TRACKSCAN") {
postdata = Object.assign(postdata, editable); postdata = Object.assign(postdata, editable);
postdata.runner = postdata.runner.id;
postdata.track = postdata.track.id; postdata.track = postdata.track.id;
ScanService.scanControllerPutTrackScan(original_data.id, postdata) ScanService.scanControllerPutTrackScan(original_data.id, postdata)
.then((resp) => { .then((resp) => {
@ -70,7 +70,6 @@
.catch((err) => {}); .catch((err) => {});
} else { } else {
postdata = Object.assign(postdata, editable); postdata = Object.assign(postdata, editable);
postdata.runner = postdata.runner.id;
ScanService.scanControllerPut(original_data.id, postdata) ScanService.scanControllerPut(original_data.id, postdata)
.then((resp) => { .then((resp) => {
Object.assign(original_data, editable); Object.assign(original_data, editable);
@ -153,9 +152,9 @@
</div> </div>
</div> </div>
<div class="mb-8 text-3xl font-extrabold leading-tight"> <div class="mb-8 text-3xl font-extrabold leading-tight">
{original_data.runner.firstname} {runner.value?.firstname}
{original_data.runner.middlename || ''} {runner.value?.middlename || ''}
{original_data.runner.lastname} {runner.value?.lastname}
#{original_data.id} #{original_data.id}
<span data-id="donation_actions_${original_data.id}"> <span data-id="donation_actions_${original_data.id}">
{#if store.state.jwtinfo.userdetails.permissions.includes('SCAN:DELETE')} {#if store.state.jwtinfo.userdetails.permissions.includes('SCAN:DELETE')}
@ -235,7 +234,7 @@
noOptionsMessage={$_('no-runners-found')} noOptionsMessage={$_('no-runners-found')}
bind:selectedValue={runner} bind:selectedValue={runner}
on:select={(selectedValue) => { on:select={(selectedValue) => {
editable.runner = selectedValue.detail.value; editable.runner = selectedValue.detail.value.id;
}} }}
on:clear={() => (editable.runner = null)} /> on:clear={() => (editable.runner = null)} />
</div> </div>