diff options
| author | Runxi Yu <me@runxiyu.org> | 2025-04-05 23:18:30 +0800 |
|---|---|---|
| committer | Runxi Yu <me@runxiyu.org> | 2025-04-05 23:18:30 +0800 |
| commit | edc30e6d36b51f73d2db31e6fbc55f86e8ca451f (patch) | |
| tree | 5d15da4dc72b71e86f7293e51d12b29706e8889a /http_handle_repo_contrib_index.go | |
| parent | Remove an unnecessary nolint:gochecknoglobals (diff) | |
| download | forge-edc30e6d36b51f73d2db31e6fbc55f86e8ca451f.tar.gz forge-edc30e6d36b51f73d2db31e6fbc55f86e8ca451f.tar.zst forge-edc30e6d36b51f73d2db31e6fbc55f86e8ca451f.zip | |
web: Separate HTTP error pages into its own package
Diffstat (limited to 'http_handle_repo_contrib_index.go')
| -rw-r--r-- | http_handle_repo_contrib_index.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/http_handle_repo_contrib_index.go b/http_handle_repo_contrib_index.go index a4b1eac..b83dfcb 100644 --- a/http_handle_repo_contrib_index.go +++ b/http_handle_repo_contrib_index.go @@ -7,6 +7,7 @@ import ( "net/http" "github.com/jackc/pgx/v5" + "go.lindenii.runxiyu.org/forge/internal/web" ) // idTitleStatus describes properties of a merge request that needs to be @@ -27,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 { - errorPage500(writer, params, "Error querying merge requests: "+err.Error()) + web.ErrorPage500(templates, writer, params, "Error querying merge requests: "+err.Error()) return } defer rows.Close() @@ -36,13 +37,13 @@ func (s *Server) httpHandleRepoContribIndex(writer http.ResponseWriter, request var mrID int var mrTitle, mrStatus string if err = rows.Scan(&mrID, &mrTitle, &mrStatus); err != nil { - errorPage500(writer, params, "Error scanning merge request: "+err.Error()) + web.ErrorPage500(templates, writer, params, "Error scanning merge request: "+err.Error()) return } result = append(result, idTitleStatus{mrID, mrTitle, mrStatus}) } if err = rows.Err(); err != nil { - errorPage500(writer, params, "Error ranging over merge requests: "+err.Error()) + web.ErrorPage500(templates, writer, params, "Error ranging over merge requests: "+err.Error()) return } params["merge_requests"] = result |