diff options
author | zeripath <art27@cantab.net> | 2020-10-24 00:46:35 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-23 19:46:35 -0400 |
commit | f40a2a4404e3eabf5e28ae43e1f395bb13176307 (patch) | |
tree | e4c0ece7b11704eba0e9e60cb10158dbb5399db8 /web_src/js/index.js | |
parent | 9b11c3e32037a77e53551127d26dbf54139aa2fc (diff) | |
download | gitea-f40a2a4404e3eabf5e28ae43e1f395bb13176307.tar.gz gitea-f40a2a4404e3eabf5e28ae43e1f395bb13176307.zip |
Store task errors following migrations and display them (#13246)
* Store task errors following migrations and display them
When migrate tasks fail store the error in the task table
and ensure that they show on the status page.
Fix #13242
Signed-off-by: Andrew Thornton <art27@cantab.net>
* Update web_src/js/index.js
* Hide the failed first
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Diffstat (limited to 'web_src/js/index.js')
-rw-r--r-- | web_src/js/index.js | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/web_src/js/index.js b/web_src/js/index.js index 8636427092..489651e3b1 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -192,25 +192,32 @@ function updateIssuesMeta(url, action, issueIds, elementId) { function initRepoStatusChecker() { const migrating = $('#repo_migrating'); $('#repo_migrating_failed').hide(); + $('#repo_migrating_failed_image').hide(); if (migrating) { - const repo_name = migrating.attr('repo'); - if (typeof repo_name === 'undefined') { + const task = migrating.attr('task'); + if (typeof task === 'undefined') { return; } $.ajax({ type: 'GET', - url: `${AppSubUrl}/${repo_name}/status`, + url: `${AppSubUrl}/user/task/${task}`, data: { _csrf: csrf, }, complete(xhr) { if (xhr.status === 200) { if (xhr.responseJSON) { - if (xhr.responseJSON.status === 0) { + if (xhr.responseJSON.status === 4) { window.location.reload(); return; + } else if (xhr.responseJSON.status === 3) { + $('#repo_migrating_progress').hide(); + $('#repo_migrating').hide(); + $('#repo_migrating_failed').show(); + $('#repo_migrating_failed_image').show(); + $('#repo_migrating_failed_error').text(xhr.responseJSON.err); + return; } - setTimeout(() => { initRepoStatusChecker(); }, 2000); @@ -218,7 +225,9 @@ function initRepoStatusChecker() { } } $('#repo_migrating_progress').hide(); + $('#repo_migrating').hide(); $('#repo_migrating_failed').show(); + $('#repo_migrating_failed_image').show(); } }); } |