Theodor-Springmann-Stiftung/musenalm
1
0
Fork 0
mirror of https://github.com/Theodor-Springmann-Stiftung/musenalm.git synced 2025-10-29 17:25:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:Theodor-Springmann-Stiftung/musenalm

Browse Source
This commit is contained in:
Simon Martens
2025-03-18 11:27:27 +01:00
parent 0f570b1324 96153381fb
commit fcc233b3f8
7 changed files with 41 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
pages/suche.go
View File

@@ -18,12 +18,13 @@ type SuchePage struct {
}
const (
URL_SUCHE = "/suche/{type}"
URL_SUCHE_ALT = "/suche/{$}"
DEFAULT_SUCHE = "/suche/baende"
PARAM_EXTENDED = "extended"
TEMPLATE_SUCHE = "/suche/"
PARAM_QUERY = "q"
URL_SUCHE = "/suche/{type}"
URL_SUCHE_ALT = "/suche/{$}"
DEFAULT_SUCHE = "/suche/baende"
PARAM_EXTENDED = "extended"
TEMPLATE_SUCHE = "/suche/"
PARAM_QUERY = "q"
PARAM_PLACEHOLDER = "p"
)
var availableTypes = []string{"baende", "beitraege"}
@@ -106,9 +107,10 @@ func (p *SuchePage) SearchBaendeRequest(app core.App, engine *templating.Engine,
var ErrInvalidCollectionType = fmt.Errorf("Invalid collection type")
type Parameters struct {
Extended bool
Collection string
Query string
Extended bool
Collection string
Query string
Placeholder string
}
func NewParameters(e *core.RequestEvent) (*Parameters, error) {
@@ -122,10 +124,17 @@ func NewParameters(e *core.RequestEvent) (*Parameters, error) {
extended = true
}
query := e.Request.URL.Query().Get(PARAM_QUERY)
placeholder := query
if query == "" {
placeholder = e.Request.URL.Query().Get(PARAM_PLACEHOLDER)
}
return &Parameters{
Collection: collection,
Extended: extended,
Query: e.Request.URL.Query().Get(PARAM_QUERY),
Collection: collection,
Extended: extended,
Query: query,
Placeholder: placeholder,
}, nil
}

2
pages/suche_parameters.go
View File

@@ -303,7 +303,7 @@ func (p SearchParameters) ToQueryParamsBaende() string {
}
func (p SearchParameters) IsBeitraegeSearch() bool {
return p.Collection == "beitraege" && (p.Query != "" || p.AlmString != "" || p.AnnotationsString != "" || p.PersonsString != "" || p.TitleString != "" || p.YearString != "" || p.EntryString != "" || p.IncipitString != "")
return p.Collection == "beitraege" && (p.Query != "" || p.TypeString != "" || p.AlmString != "" || p.AnnotationsString != "" || p.PersonsString != "" || p.TitleString != "" || p.YearString != "" || p.EntryString != "" || p.IncipitString != "")
}
func (p SearchParameters) IsBaendeSearch() bool {