summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2019-10-29 14:18:12 +0100
committerSimon Rettberg2019-10-29 14:18:12 +0100
commitfab2a1b207a50278c1be7b6bbb1cd4ee26a29575 (patch)
tree40f997170103f2114c36983950577fa5b154f20e
parent[adduser/minilinux] Take care of default/nondefault fields (diff)
downloadslx-admin-fab2a1b207a50278c1be7b6bbb1cd4ee26a29575.tar.gz
slx-admin-fab2a1b207a50278c1be7b6bbb1cd4ee26a29575.tar.xz
slx-admin-fab2a1b207a50278c1be7b6bbb1cd4ee26a29575.zip
[minilinux] Show errors from minilinux download task
-rw-r--r--modules-available/minilinux/templates/branches.html7
-rw-r--r--modules-available/minilinux/templates/filelist.html1
2 files changed, 8 insertions, 0 deletions
diff --git a/modules-available/minilinux/templates/branches.html b/modules-available/minilinux/templates/branches.html
index 5f3c4e50..d8fb1f68 100644
--- a/modules-available/minilinux/templates/branches.html
+++ b/modules-available/minilinux/templates/branches.html
@@ -63,9 +63,16 @@
});
var taskDone = {};
var wasUnfinished = false;
+ var errors = {};
function dlTmCb(task) {
if (!task.data || !task.data.files)
return;
+ if (task.data.error) {
+ if (errors[task.id] !== task.data.error) {
+ errors[task.id] = task.data.error;
+ $('#error-' + task.id).text(errors[task.id]).show();
+ }
+ }
for (var i = 0; i < task.data.files.length; ++i) {
var f = task.data.files[i];
var id = task.id + f.id;
diff --git a/modules-available/minilinux/templates/filelist.html b/modules-available/minilinux/templates/filelist.html
index 9aa175bd..0d8b9901 100644
--- a/modules-available/minilinux/templates/filelist.html
+++ b/modules-available/minilinux/templates/filelist.html
@@ -49,6 +49,7 @@
</table>
{{#dltask}}
<div class="hidden" data-tm-id="{{dltask}}" data-tm-callback="dlTmCb"></div>
+<pre class="collapse" id="error-{{dltask}}"></pre>
{{/dltask}}
{{#changelog}}
<h4>{{lang_changelog}}</h4>