Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Unified Diff: milo/appengine/console/html.go

Issue 2748073006: Milo Refactor: Remove theme support (Closed)
Patch Set: Fix builder.html pointer Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: milo/appengine/console/html.go
diff --git a/milo/appengine/console/html.go b/milo/appengine/console/html.go
index c482642d4d06e80b9ab394a23dae040f1a797b29..0e0728258cfa24d8bf44825d0fd644d3d5d0f228 100644
--- a/milo/appengine/console/html.go
+++ b/milo/appengine/console/html.go
@@ -7,40 +7,27 @@ package console
import (
"net/http"
- "github.com/julienschmidt/httprouter"
- "golang.org/x/net/context"
-
- "github.com/luci/luci-go/milo/appengine/settings"
- "github.com/luci/luci-go/milo/common/miloerror"
+ "github.com/luci/luci-go/milo/appengine/common"
+ "github.com/luci/luci-go/server/router"
"github.com/luci/luci-go/server/templates"
)
-type Console struct{}
-
-// GetTemplateName returns the template name for console pages.
-func (x Console) GetTemplateName(t settings.Theme) string {
- return "console.html"
-}
-
-// Render renders the console page.
-func (x Console) Render(c context.Context, r *http.Request, p httprouter.Params) (*templates.Args, error) {
- project := p.ByName("project")
+// ConsoleHandler renders the console page.
+func ConsoleHandler(c *router.Context) {
+ project := c.Params.ByName("project")
if project == "" {
- return nil, &miloerror.Error{
- Message: "Missing project",
- Code: http.StatusBadRequest,
- }
+ common.ErrorPage(c, http.StatusBadRequest, "Missing Project")
+ return
}
- name := p.ByName("name")
+ name := c.Params.ByName("name")
- result, err := console(c, project, name)
+ result, err := console(c.Context, project, name)
if err != nil {
- return nil, err
+ common.ErrorPage(c, http.StatusInternalServerError, err.Error())
+ return
}
- // Render into the template
- args := &templates.Args{
+ templates.MustRender(c.Context, c.Writer, "pages/console.html", templates.Args{
"Console": result,
- }
- return args, nil
+ })
}

Powered by Google App Engine
This is Rietveld 408576698