aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorzeripath <art27@cantab.net>2020-07-05 20:38:03 +0100
committerGitHub <noreply@github.com>2020-07-05 22:38:03 +0300
commit217647f33170d469ed392e3284cc1149047c1b74 (patch)
tree44b06b44d2872b90f873eb3ac7cca6e8e0e6494c /modules
parent0d03fbf2ca4d1110c913647cb6906a7d51e46db8 (diff)
downloadgitea-217647f33170d469ed392e3284cc1149047c1b74.tar.gz
gitea-217647f33170d469ed392e3284cc1149047c1b74.zip
Multiple small admin dashboard fixes (#12153)
* 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>
Diffstat (limited to 'modules')
-rw-r--r--modules/auth/admin.go3
-rw-r--r--modules/queue/setting.go1
2 files changed, 3 insertions, 1 deletions
diff --git a/modules/auth/admin.go b/modules/auth/admin.go
index af7197d2ae..9caf81e07f 100644
--- a/modules/auth/admin.go
+++ b/modules/auth/admin.go
@@ -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
diff --git a/modules/queue/setting.go b/modules/queue/setting.go
index c47e85f756..786a08a3b0 100644
--- a/modules/queue/setting.go
+++ b/modules/queue/setting.go
@@ -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 {