Fix default sorting UI state (#598)
Cette révision appartient à :
Parent
d7071767f9
révision
6fc5423166
1 fichiers modifiés avec 27 ajouts et 12 suppressions
|
@ -45,15 +45,22 @@ var FuncMap = template.FuncMap{
|
||||||
},
|
},
|
||||||
"genSearchWithOrdering": func(currentUrl url.URL, sortBy string) template.URL {
|
"genSearchWithOrdering": func(currentUrl url.URL, sortBy string) template.URL {
|
||||||
values := currentUrl.Query()
|
values := currentUrl.Query()
|
||||||
order := false
|
order := false //Default is DESC
|
||||||
|
sort := "2" //Default is Date (Actually ID, but Date is the same thing)
|
||||||
|
|
||||||
if _, ok := values["order"]; ok {
|
if _, ok := values["order"]; ok {
|
||||||
order, _ = strconv.ParseBool(values["order"][0])
|
order, _ = strconv.ParseBool(values["order"][0])
|
||||||
if values["sort"][0] == sortBy {
|
|
||||||
order = !order //Flip order by repeat-clicking
|
|
||||||
} else {
|
|
||||||
order = false //Default to descending when sorting by something new
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
if _, ok := values["sort"]; ok {
|
||||||
|
sort = values["sort"][0]
|
||||||
|
}
|
||||||
|
|
||||||
|
if sort == sortBy {
|
||||||
|
order = !order //Flip order by repeat-clicking
|
||||||
|
} else {
|
||||||
|
order = false //Default to descending when sorting by something new
|
||||||
|
}
|
||||||
|
|
||||||
values.Set("sort", sortBy)
|
values.Set("sort", sortBy)
|
||||||
values.Set("order", strconv.FormatBool(order))
|
values.Set("order", strconv.FormatBool(order))
|
||||||
|
|
||||||
|
@ -67,13 +74,21 @@ var FuncMap = template.FuncMap{
|
||||||
leftclass := "sortarrowdim"
|
leftclass := "sortarrowdim"
|
||||||
rightclass := "sortarrowdim"
|
rightclass := "sortarrowdim"
|
||||||
|
|
||||||
|
order := false
|
||||||
|
sort := "2"
|
||||||
|
|
||||||
if _, ok := values["order"]; ok {
|
if _, ok := values["order"]; ok {
|
||||||
if values["sort"][0] == sortBy {
|
order, _ = strconv.ParseBool(values["order"][0])
|
||||||
if values["order"][0] == "true" {
|
}
|
||||||
rightclass = ""
|
if _, ok := values["sort"]; ok {
|
||||||
} else {
|
sort = values["sort"][0]
|
||||||
leftclass = ""
|
}
|
||||||
}
|
|
||||||
|
if sort == sortBy {
|
||||||
|
if order {
|
||||||
|
rightclass = ""
|
||||||
|
} else {
|
||||||
|
leftclass = ""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Référencer dans un nouveau ticket