Skip to content

Commit fd3a828

Browse files
committed
Merge branch 'main' into stable
2 parents a009290 + e5be23e commit fd3a828

2 files changed

Lines changed: 11 additions & 6 deletions

File tree

libpolybase/courses.go

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package libpolybase
33
import (
44
"context"
55
"database/sql"
6+
"errors"
67
"fmt"
78
"log"
89
"regexp"
@@ -308,12 +309,16 @@ func (pb *PB) ListCourse(ctx context.Context, showHidden bool, filterSemester *s
308309
return nil, fmt.Errorf("scan course: %w", err)
309310
}
310311

311-
c.Year, err = GetYear(c.Code)
312-
if err != nil {
313-
return nil, err
312+
var errIn error
313+
c.Year, errIn = GetYear(c.Code)
314+
if errIn != nil {
315+
err = errors.Join(err, errIn, fmt.Errorf("invalid course %s (%s)", c.Name, c.Code))
316+
} else {
317+
courses = append(courses, c)
314318
}
315-
316-
courses = append(courses, c)
319+
}
320+
if err != nil {
321+
return nil, err
317322
}
318323

319324
if err = rows.Err(); err != nil {

views/login.templ

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ templ Login() {
1818
}
1919

2020
templ LoginForm() {
21-
<form hx-post="/auth" class="rounded-lg px-6 py-8 border border-base-300">
21+
<form hx-post="/auth" class="rounded-lg px-6 py-8 border border-base-300" method="post" action="/auth">
2222
<h2 class="text-2xl font-bold mb-6">Bienvenue sur Polybase !</h2>
2323
<div class="space-y-4">
2424
@LoginFormInput("username", "Nom d'utilisateur", "text")

0 commit comments

Comments
 (0)