aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2021-03-10 17:30:52 +0100
committerDmitry Vyukov <dvyukov@google.com>2021-03-11 21:26:46 +0100
commit429d8a6becba0a60e99331e293e6117597e9e530 (patch)
tree1de81fa783cfa0a4bb907a45665725799f09fcb2
parentcaa359ddd2e28812df24e1d670cd9de615fcf72a (diff)
dashboard/app: show only single manager in filter mode
Don't show all managers in manager filter mode, e.g.: https://syzkaller.appspot.com/upstream?manager=ci-qemu2-arm64-mte Other managers only add clutter in this mode.
-rw-r--r--dashboard/app/main.go15
1 files changed, 9 insertions, 6 deletions
diff --git a/dashboard/app/main.go b/dashboard/app/main.go
index 02f55c665..03ea540a1 100644
--- a/dashboard/app/main.go
+++ b/dashboard/app/main.go
@@ -220,11 +220,11 @@ func handleMain(c context.Context, w http.ResponseWriter, r *http.Request) error
return err
}
accessLevel := accessLevel(c, r)
- managers, err := loadManagers(c, accessLevel, hdr.Namespace)
+ manager := r.FormValue("manager")
+ managers, err := loadManagers(c, accessLevel, hdr.Namespace, manager)
if err != nil {
return err
}
- manager := r.FormValue("manager")
groups, err := fetchNamespaceBugs(c, accessLevel, hdr.Namespace, manager)
if err != nil {
return err
@@ -303,7 +303,7 @@ func handleAdmin(c context.Context, w http.ResponseWriter, r *http.Request) erro
if err != nil {
return err
}
- managers, err := loadManagers(c, accessLevel, "")
+ managers, err := loadManagers(c, accessLevel, "", "")
if err != nil {
return err
}
@@ -958,10 +958,10 @@ func makeUIBuild(build *Build) *uiBuild {
}
}
-func loadManagers(c context.Context, accessLevel AccessLevel, ns string) ([]*uiManager, error) {
+func loadManagers(c context.Context, accessLevel AccessLevel, ns, manager string) ([]*uiManager, error) {
now := timeNow(c)
date := timeDate(now)
- managers, managerKeys, err := loadManagerList(c, accessLevel, ns)
+ managers, managerKeys, err := loadManagerList(c, accessLevel, ns, manager)
if err != nil {
return nil, err
}
@@ -1043,7 +1043,7 @@ func loadManagers(c context.Context, accessLevel AccessLevel, ns string) ([]*uiM
return results, nil
}
-func loadManagerList(c context.Context, accessLevel AccessLevel, ns string) ([]*Manager, []*db.Key, error) {
+func loadManagerList(c context.Context, accessLevel AccessLevel, ns, manager string) ([]*Manager, []*db.Key, error) {
managers, keys, err := loadAllManagers(c, ns)
if err != nil {
return nil, nil, err
@@ -1058,6 +1058,9 @@ func loadManagerList(c context.Context, accessLevel AccessLevel, ns string) ([]*
if ns == "" && cfg.Decommissioned {
continue
}
+ if manager != "" && manager != mgr.Name {
+ continue
+ }
filtered = append(filtered, mgr)
filteredKeys = append(filteredKeys, keys[i])
}