Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-13 17:05:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #1846) Fix repository creation indicator's condition

Browse Source
This commit is contained in:
Naoki Takezoe
2018-01-20 05:32:21 +09:00
parent f075132878
commit 5f0cacd7c1
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
View File

@@ -168,9 +168,10 @@ trait RepositoryViewerControllerBase extends ControllerBase {
val owner = params("owner") val owner = params("owner")
val repository = params("repository") val repository = params("repository")
contentType = formats("json") contentType = formats("json")
val creating = RepositoryCreationService.isCreating(owner, repository)
Serialization.write(Map( Serialization.write(Map(
"creating" -> RepositoryCreationService.isCreating(owner, repository), "creating" -> creating,
"error" -> RepositoryCreationService.getCreationError(owner, repository) "error" -> (if(creating) None else RepositoryCreationService.getCreationError(owner, repository))
)) ))
} }

5
src/main/twirl/gitbucket/core/repo/creating.scala.html
View File

@@ -22,7 +22,6 @@
function checkCreating() { function checkCreating() {
$.get('@context.path/@owner/@repository/creating', function (data) { $.get('@context.path/@owner/@repository/creating', function (data) {
console.log(data);
if (data.creating == true) { if (data.creating == true) {
setTimeout(checkCreating, 2000); setTimeout(checkCreating, 2000);
} else { } else {
@@ -31,9 +30,7 @@
$('#error').show(); $('#error').show();
$('#progress').hide(); $('#progress').hide();
} else { } else {
setTimeout(function(){ setTimeout(function(){ location.href = '@context.path/@owner/@repository'; });
location.href = '@context.path/@owner/@repository';
}, 2000);
} }
} }
}); });