added leagues
This commit is contained in:
@@ -24,12 +24,17 @@ func SeasonEditPage(
|
||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
seasonStr := r.PathValue("season_short_name")
|
||||
var season *db.Season
|
||||
var allLeagues []*db.League
|
||||
if ok := db.WithReadTx(s, w, r, conn, func(ctx context.Context, tx bun.Tx) (bool, error) {
|
||||
var err error
|
||||
season, err = db.GetSeason(ctx, tx, seasonStr)
|
||||
if err != nil {
|
||||
return false, errors.Wrap(err, "db.GetSeason")
|
||||
}
|
||||
allLeagues, err = db.GetLeagues(ctx, tx)
|
||||
if err != nil {
|
||||
return false, errors.Wrap(err, "db.GetLeagues")
|
||||
}
|
||||
return true, nil
|
||||
}); !ok {
|
||||
return
|
||||
@@ -38,7 +43,7 @@ func SeasonEditPage(
|
||||
throw.NotFound(s, w, r, r.URL.Path)
|
||||
return
|
||||
}
|
||||
renderSafely(seasonsview.EditPage(season), s, r, w)
|
||||
renderSafely(seasonsview.EditPage(season, allLeagues), s, r, w)
|
||||
})
|
||||
}
|
||||
|
||||
@@ -60,10 +65,12 @@ func SeasonEditSubmit(
|
||||
MonthNumeric2().Slash().
|
||||
Year4().Build()
|
||||
|
||||
startDate := getter.Time("start_date", format).Required().Value
|
||||
endDate := getter.Time("end_date", format).Value
|
||||
finalsStartDate := getter.Time("finals_start_date", format).Value
|
||||
finalsEndDate := getter.Time("finals_end_date", format).Value
|
||||
version := getter.String("slap_version").
|
||||
TrimSpace().Required().AllowedValues([]string{"rebound", "slapshot1"}).Value
|
||||
start := getter.Time("start_date", format).Required().Value
|
||||
end := getter.Time("end_date", format).Value
|
||||
finalsStart := getter.Time("finals_start_date", format).Value
|
||||
finalsEnd := getter.Time("finals_end_date", format).Value
|
||||
|
||||
if !getter.ValidateAndNotify(s, w, r) {
|
||||
return
|
||||
@@ -79,9 +86,9 @@ func SeasonEditSubmit(
|
||||
if season == nil {
|
||||
return false, errors.New("season does not exist")
|
||||
}
|
||||
season.Update(startDate, endDate, finalsStartDate, finalsEndDate)
|
||||
season.Update(version, start, end, finalsStart, finalsEnd)
|
||||
err = db.Update(tx, season).WherePK().
|
||||
Column("start_date", "end_date", "finals_start_date", "finals_end_date").
|
||||
Column("slap_version", "start_date", "end_date", "finals_start_date", "finals_end_date").
|
||||
WithAudit(r, audit.Callback()).Exec(ctx)
|
||||
if err != nil {
|
||||
return false, errors.Wrap(err, "db.Update")
|
||||
|
||||
Reference in New Issue
Block a user