Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2026-05-07 20:07:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix error page for repository creation

Browse Source
This commit is contained in:
Naoki Takezoe
2017-12-04 20:55:11 +09:00
parent 58635674cb
commit d157426d66
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/gitbucket/core/service/RepositoryCreationService.scala
View File

@@ -39,7 +39,7 @@ object RepositoryCreationService {
}
def getCreationError(owner: String, repository: String): Option[String] = {
Option(Creating.get(s"${owner}/${repository}")).getOrElse(None)
Option(Creating.remove(s"${owner}/${repository}")).getOrElse(None)
}
}

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

@@ -2,10 +2,16 @@
@gitbucket.core.html.main("Creating...") {
<div class="content-wrapper main-center">
<div class="content body">
<div class="text-center">
<!-- Progress bar -->
<div class="text-center" id="progress">
<h2>Creating repository...</h2>
<img src="@context.path/assets/common/images/indicator-bar.gif"/>
</div>
<!-- Error message -->
<div id="error" style="display: none;">
<h1>Failed to create repository</h1>
<div id="errorMessage"></div>
</div>
</div>
</div>
}
@@ -21,8 +27,9 @@
setTimeout(checkCreating, 2000);
} else {
if (data.error) {
alert(data.error);
location.href = '@context.path/new';
$('#errorMessage').text(data.error);
$('#error').show();
$('#progress').hide();
} else {
location.href = '@context.path/@owner/@repository';
}