* Remove spurious spacing between Maintenance Operations and its table on dashboard * Prevent (EXTRA string) comments in Task headers * Redirect tasks started from monitor page back to monitor * Fix #12107 - redirects from process cancel should use AppSubUrl * When wrapping queues set the name correctly Signed-off-by: Andrew Thornton <art27@cantab.net>tags/v1.13.0-rc1
@@ -51,7 +51,8 @@ func (f *AdminEditUserForm) Validate(ctx *macaron.Context, errs binding.Errors) | |||
// AdminDashboardForm form for admin dashboard operations | |||
type AdminDashboardForm struct { | |||
Op string `binding:"required"` | |||
Op string `binding:"required"` | |||
From string | |||
} | |||
// Validate validates form fields |
@@ -75,6 +75,7 @@ func CreateQueue(name string, handle HandlerFunc, exemplar interface{}) Queue { | |||
MaxAttempts: q.MaxAttempts, | |||
Config: cfg, | |||
QueueLength: q.Length, | |||
Name: name, | |||
}, exemplar) | |||
} | |||
if err != nil { |
@@ -1867,12 +1867,12 @@ dashboard.operation_switch = Switch | |||
dashboard.operation_run = Run | |||
dashboard.clean_unbind_oauth = Clean unbound OAuth connections | |||
dashboard.clean_unbind_oauth_success = All unbound OAuth connections have been deleted. | |||
dashboard.task.started=Started Task: %s | |||
dashboard.task.process=Task: %s | |||
dashboard.task.cancelled=Task: %s cancelled: %[3]s | |||
dashboard.task.error=Error in Task: %s: %[3]s | |||
dashboard.task.finished=Task: %s started by %s has finished | |||
dashboard.task.unknown=Unknown task: %s | |||
dashboard.task.started=Started Task: %[1]s | |||
dashboard.task.process=Task: %[1]s | |||
dashboard.task.cancelled=Task: %[1]s cancelled: %[3]s | |||
dashboard.task.error=Error in Task: %[1]s: %[3]s | |||
dashboard.task.finished=Task: %[1]s started by %[2]s has finished | |||
dashboard.task.unknown=Unknown task: %[1]s | |||
dashboard.cron.started=Started Cron: %[1]s | |||
dashboard.cron.process=Cron: %[1]s | |||
dashboard.cron.cancelled=Cron: %s cancelled: %[3]s |
@@ -153,8 +153,11 @@ func DashboardPost(ctx *context.Context, form auth.AdminDashboardForm) { | |||
ctx.Flash.Error(ctx.Tr("admin.dashboard.task.unknown", form.Op)) | |||
} | |||
} | |||
ctx.Redirect(setting.AppSubURL + "/admin") | |||
if form.From == "monitor" { | |||
ctx.Redirect(setting.AppSubURL + "/admin/monitor") | |||
} else { | |||
ctx.Redirect(setting.AppSubURL + "/admin") | |||
} | |||
} | |||
// SendTestMail send test mail to confirm mail service is OK | |||
@@ -331,7 +334,7 @@ func MonitorCancel(ctx *context.Context) { | |||
pid := ctx.ParamsInt64("pid") | |||
process.GetManager().Cancel(pid) | |||
ctx.JSON(200, map[string]interface{}{ | |||
"redirect": ctx.Repo.RepoLink + "/admin/monitor", | |||
"redirect": setting.AppSubURL + "/admin/monitor", | |||
}) | |||
} | |||
@@ -14,9 +14,9 @@ | |||
<h4 class="ui top attached header"> | |||
{{.i18n.Tr "admin.dashboard.operations"}} | |||
</h4> | |||
<div class="ui attached table segment"> | |||
<form method="post" action="{{AppSubUrl}}/admin"> | |||
{{.CsrfTokenHtml}} | |||
<form method="post" action="{{AppSubUrl}}/admin"> | |||
{{.CsrfTokenHtml}} | |||
<div class="ui attached table segment"> | |||
<table class="ui very basic table"> | |||
<tbody> | |||
<tr> | |||
@@ -62,8 +62,8 @@ | |||
</tr> | |||
</tbody> | |||
</table> | |||
</form> | |||
</div> | |||
</div> | |||
</form> | |||
<h4 class="ui top attached header"> | |||
{{.i18n.Tr "admin.dashboard.system_status"}} |
@@ -8,6 +8,7 @@ | |||
</h4> | |||
<div class="ui attached table segment"> | |||
<form method="post" action="{{AppSubUrl}}/admin"> | |||
<input type="hidden" name="from" value="monitor"/> | |||
{{.CsrfTokenHtml}} | |||
<table class="ui very basic striped table"> | |||
<thead> |