Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/application.go
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ func (a *Application) Start() {
}

// Delete Team member
router.HandleFunc("GET /register/teacher/team/delete", a.HandleTeacherDeleteMember)
router.HandleFunc("POST /register/teacher/team/delete", a.HandleTeacherDeleteMember)

// Email confirmation code handling
router.HandleFunc("GET /register/teacher/emaillogin", a.HandleTeacherEmailLogin)
Expand Down
9 changes: 7 additions & 2 deletions internal/teacherteammembers.go
Original file line number Diff line number Diff line change
Expand Up @@ -248,8 +248,13 @@ func (a *Application) HandleTeacherDeleteMember(w http.ResponseWriter, r *http.R
return
}

email := r.URL.Query().Get("email")
teamIDStr := r.URL.Query().Get("team_id")
if err := r.ParseForm(); err != nil {
a.Log.Err(err).Msg("failed to parse form")
w.WriteHeader(http.StatusBadRequest)
return
}
email := r.FormValue("email")
teamIDStr := r.FormValue("team_id")
log := a.Log.With().
Str("page_name", "teacher_delete_member").
Str("team_id", teamIDStr).
Expand Down
13 changes: 8 additions & 5 deletions website/templates/teamedit.html
Original file line number Diff line number Diff line change
Expand Up @@ -174,11 +174,14 @@ <h4 class="card-header">Team Members</h4>
<td>{{ if .PreviouslyParticipated }}Yes{{ else }}No{{ end }}</td>
<td>{{ .ParentEmail }}</td>
<td class="text-center">
<a href="/register/teacher/team/delete?team_id={{ $t.ID }}&email={{ .Email }}"
onclick="return confirm('Are you sure you want to remove {{ .Name }} from {{ $t.Name }}?')"
class="btn btn-danger">
<i class="fa fa-times"></i>
</a>
<form method="POST" action="/register/teacher/team/delete"
onsubmit="return confirm('Are you sure you want to remove {{ .Name }} from {{ $t.Name }}?')">
<input type="hidden" name="team_id" value="{{ $t.ID }}">
<input type="hidden" name="email" value="{{ .Email }}">
<button type="submit" class="btn btn-danger">
<i class="fa fa-times"></i>
</button>
</form>
</td>
</tr>
{{ end }}
Expand Down
Loading