mirror of
https://github.com/Eggbertx/gochan.git
synced 2025-08-04 16:16:22 -07:00
Fix condition double-sending
This commit is contained in:
parent
a7744d6d88
commit
38c4107b15
3 changed files with 112 additions and 46 deletions
|
@ -252,9 +252,6 @@ func filtersCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql.
|
|||
errEv.Err(err).Caller().Int("filterID", filterID).Msg("Unable to get filter from ID")
|
||||
return nil, err
|
||||
}
|
||||
if conditions, err = filter.Conditions(); err != nil {
|
||||
errEv.Err(err).Caller().Int("filterID", filterID).Msg("Unable to get filter conditions list")
|
||||
}
|
||||
}
|
||||
|
||||
for k, v := range request.PostForm {
|
||||
|
@ -271,7 +268,6 @@ func filtersCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql.
|
|||
boardIDLogArr.Int(boardID)
|
||||
boards = append(boards, boardID)
|
||||
}
|
||||
infoEv.Array("boardIDs", boardIDLogArr)
|
||||
|
||||
// set filter conditions
|
||||
if strings.HasPrefix(k, "field") {
|
||||
|
@ -319,8 +315,10 @@ func filtersCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql.
|
|||
Msg("Unable to submit filter")
|
||||
return nil, err
|
||||
}
|
||||
infoEv.Msg("Filter submitted")
|
||||
}
|
||||
|
||||
data["filterBoards"] = make([]int, 0)
|
||||
if editFilter := request.FormValue("edit"); editFilter != "" {
|
||||
// user clicked on Edit link in filter row
|
||||
filterID, err := strconv.Atoi(editFilter)
|
||||
|
@ -338,6 +336,10 @@ func filtersCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql.
|
|||
errEv.Err(err).Caller().Int("filterID", filterID).Msg("Unable to get filter conditions")
|
||||
return nil, errors.New("unable to get filter conditions")
|
||||
}
|
||||
if data["filterBoards"], err = filter.BoardIDs(); err != nil {
|
||||
errEv.Err(err).Caller().Msg("Unable to get filter board IDs")
|
||||
return nil, errors.New("unable to get filter board IDs")
|
||||
}
|
||||
} else {
|
||||
// user loaded /manage/filters, populate single "default" condition
|
||||
data["filter"] = &gcsql.Filter{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue