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

Minor fix for WebHook testing UI (#2744)

Browse Source
This commit is contained in:
Naoki Takezoe
2021-04-17 12:40:14 +09:00
committed by GitHub
parent b7aa3e69f4
commit 1ceac4ef9f
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
View File

@@ -342,7 +342,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
.map( .map(
res => res =>
Map( Map(
"status" -> res.getStatusLine(), "status" -> res.getStatusLine.getStatusCode,
"body" -> EntityUtils.toString(res.getEntity()), "body" -> EntityUtils.toString(res.getEntity()),
"headers" -> _headers(res.getAllHeaders()) "headers" -> _headers(res.getAllHeaders())
) )

25
src/main/twirl/gitbucket/core/settings/edithookform.scala.html
View File

@@ -96,7 +96,7 @@
<div id="test-report" style="display:none"> <div id="test-report" style="display:none">
<ul class="nav nav-tabs" id="test-report-tab"> <ul class="nav nav-tabs" id="test-report-tab">
<li class="active"><a href="#request">Request</a></li> <li class="active"><a href="#request">Request</a></li>
<li><a href="#response">Response <span class="badge badge-success" id="res-status"></span></a></li> <li><a href="#response">Response <span class="label label-success" id="res-status"></span></a></li>
</ul> </ul>
<div class="tab-content"> <div class="tab-content">
<div class="tab-pane active" id="request"> <div class="tab-pane active" id="request">
@@ -137,9 +137,9 @@ $(function(){
e.stopPropagation(); e.stopPropagation();
e.stopImmediatePropagation(); e.stopImmediatePropagation();
e.preventDefault(); e.preventDefault();
var url = this.form.url.value; const url = this.form.url.value;
var token = this.form.token.value; const token = this.form.token.value;
var ctype = this.form.ctype.value; const ctype = this.form.ctype.value;
if(!/^https?:\/\/.+/.test(url)){ if(!/^https?:\/\/.+/.test(url)){
alert("invalid url"); alert("invalid url");
return; return;
@@ -147,19 +147,18 @@ $(function(){
$("#test-modal-url").text(url) $("#test-modal-url").text(url)
$("#test-report-modal").modal('show') $("#test-report-modal").modal('show')
$("#test-report").hide(); $("#test-report").hide();
var targetUrl = '@testButtonUrl?url=' + encodeURIComponent(url) + '&ctype=' + ctype + '&token='; let targetUrl = '@testButtonUrl?url=' + encodeURIComponent(url) + '&ctype=' + ctype + '&token=';
if (token) { if (token) {
targetUrl = targetUrl + encodeURIComponent(token); targetUrl = targetUrl + encodeURIComponent(token);
} }
$.ajax({ $.ajax({
method:'POST', method: 'POST',
url:targetUrl, url: targetUrl,
success: function(e){ success: function(e){
//console.log(e);
$('#test-report-tab a:first').tab('show'); $('#test-report-tab a:first').tab('show');
$("#test-report").show(); $("#test-report").show();
$("#req-success").toggle(e.request&&!e.request.error); $("#req-success").toggle(e.request && !e.request.error);
$("#req-errors").toggle(e.request&&!!e.request.error); $("#req-errors").toggle(e.request && !!e.request.error);
$("#req-errors-body").text(e.request.error); $("#req-errors-body").text(e.request.error);
function headers(h){ function headers(h){
h = h["headers"]; h = h["headers"];
@@ -172,9 +171,9 @@ $(function(){
$("#res-success").toggle(e.response && !e.response.error); $("#res-success").toggle(e.response && !e.response.error);
$("#res-errors").toggle(e.response && !!e.response.error); $("#res-errors").toggle(e.response && !!e.response.error);
$("#res-errors-body").text(e.response.error); $("#res-errors-body").text(e.response.error);
var success = !!(e.response && e.response.status && /^2\d\d$/.test(e.response.status.statusCode)); const success = !!(e.response && e.response.status && /^2\d\d$/.test(e.response.status));
$("#res-status").text((e.response && e.response.status && e.response.status.statusCode) || "ERROR"); $("#res-status").text((e.response && e.response.status) || "ERROR");
$("#res-status").toggleClass("badge-success", success).toggleClass("badge-important", !success); $("#res-status").toggleClass("label-success", success).toggleClass("label-danger", !success);
$("#res-headers").html(headers(e.response)); $("#res-headers").html(headers(e.response));
$("#res-body").text(e.response && e.response.body ? e.response.body : ""); $("#res-body").text(e.response && e.response.body ? e.response.body : "");
}, },