fix merge woes

sreya · sreya · commit 0af367ace2e3 · 2022-09-20T04:28:39.000Z
diff --git a/coderd/templates.go b/coderd/templates.go
@@ -641,7 +641,7 @@ func (api *API) templateUserRoles(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	users, err = AuthorizeFilter(api.httpAuth, r, rbac.ActionRead, users)
+	users, err = AuthorizeFilter(api.HTTPAuth, r, rbac.ActionRead, users)
 	if err != nil {
 		httpapi.Write(rw, http.StatusInternalServerError, codersdk.Response{
 			Message: "Internal error fetching users.",

Original file line number	Diff line number	Diff line change
`@@ -641,7 +641,7 @@ func (api API) templateUserRoles(rw http.ResponseWriter, r http.Request) {`
`641`	`641`	`return`
`642`	`642`	`}`
`643`	`643`
`644`		`- users, err = AuthorizeFilter(api.httpAuth, r, rbac.ActionRead, users)`
	`644`	`+ users, err = AuthorizeFilter(api.HTTPAuth, r, rbac.ActionRead, users)`
`645`	`645`	`if err != nil {`
`646`	`646`	`httpapi.Write(rw, http.StatusInternalServerError, codersdk.Response{`
`647`	`647`	`Message: "Internal error fetching users.",`