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 /templates/repo | |
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 'templates/repo')
-rw-r--r-- | templates/repo/migrate/migrating.tmpl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/templates/repo/migrate/migrating.tmpl b/templates/repo/migrate/migrating.tmpl index 0057325e91..fdda33a2c7 100644 --- a/templates/repo/migrate/migrating.tmpl +++ b/templates/repo/migrate/migrating.tmpl @@ -7,11 +7,16 @@ {{template "base/alert" .}} <div class="home"> <div class="ui stackable middle very relaxed page grid"> - <div id="repo_migrating" class="sixteen wide center aligned centered column" repo="{{.Repo.Repository.FullName}}"> + <div id="repo_migrating" class="sixteen wide center aligned centered column" task="{{.MigrateTask.ID}}"> <div> <img src="{{StaticUrlPrefix}}/img/loading.png"/> </div> </div> + <div id="repo_migrating_failed_image" class="sixteen wide center aligned centered column" style="display: none;"> + <div> + <img src="{{StaticUrlPrefix}}/img/failed.png"/> + </div> + </div> </div> <div class="ui stackable middle very relaxed page grid"> <div class="sixteen wide center aligned centered column"> @@ -20,6 +25,7 @@ </div> <div id="repo_migrating_failed"> <p>{{.i18n.Tr "repo.migrate.migrating_failed" .CloneAddr | Safe}}</p> + <p id="repo_migrating_failed_error"></p> </div> </div> </div> |