From 0c0062b22ff4ddac9cf8c4ef84116eddba99bce2 Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Sat, 5 Apr 2025 23:59:17 +0800 Subject: templates shall no longer be a global variable --- http_handle_repo_contrib_index.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'http_handle_repo_contrib_index.go') diff --git a/http_handle_repo_contrib_index.go b/http_handle_repo_contrib_index.go index b83dfcb..7bdcb49 100644 --- a/http_handle_repo_contrib_index.go +++ b/http_handle_repo_contrib_index.go @@ -28,7 +28,7 @@ func (s *Server) httpHandleRepoContribIndex(writer http.ResponseWriter, request "SELECT repo_local_id, COALESCE(title, 'Untitled'), status FROM merge_requests WHERE repo_id = $1", params["repo_id"], ); err != nil { - web.ErrorPage500(templates, writer, params, "Error querying merge requests: "+err.Error()) + web.ErrorPage500(s.templates, writer, params, "Error querying merge requests: "+err.Error()) return } defer rows.Close() @@ -37,16 +37,16 @@ func (s *Server) httpHandleRepoContribIndex(writer http.ResponseWriter, request var mrID int var mrTitle, mrStatus string if err = rows.Scan(&mrID, &mrTitle, &mrStatus); err != nil { - web.ErrorPage500(templates, writer, params, "Error scanning merge request: "+err.Error()) + web.ErrorPage500(s.templates, writer, params, "Error scanning merge request: "+err.Error()) return } result = append(result, idTitleStatus{mrID, mrTitle, mrStatus}) } if err = rows.Err(); err != nil { - web.ErrorPage500(templates, writer, params, "Error ranging over merge requests: "+err.Error()) + web.ErrorPage500(s.templates, writer, params, "Error ranging over merge requests: "+err.Error()) return } params["merge_requests"] = result - renderTemplate(writer, "repo_contrib_index", params) + s.renderTemplate(writer, "repo_contrib_index", params) } -- cgit v1.2.3