resetbutton & almanach edit start

This commit is contained in:
Simon Martens
2025-05-30 19:30:50 +02:00
parent d8e50b27b0
commit 8ea36da40f
28 changed files with 1789 additions and 763 deletions

View File

@@ -68,6 +68,7 @@ type AlmanachResult struct {
EntriesSeries map[string]*dbmodels.REntriesSeries // <- Key is series id
EntriesAgents []*dbmodels.REntriesAgents
ContentsAgents map[string][]*dbmodels.RContentsAgents // <- Key is content id
User *dbmodels.User
Types []string
HasScans bool
@@ -166,6 +167,16 @@ func NewAlmanachResult(app core.App, id string, params BeitraegeFilterParameters
agentsMap[a.Id] = a
}
var user *dbmodels.User
if entry.Editor() != "" {
u, err := dbmodels.Users_ID(app, entry.Editor())
if err == nil {
user = u
} else {
app.Logger().Error("Failed to load user for entry editor", "entry", entry.Id, "error", err)
}
}
ret := &AlmanachResult{
Entry: entry,
Places: places,
@@ -177,6 +188,7 @@ func NewAlmanachResult(app core.App, id string, params BeitraegeFilterParameters
ContentsAgents: caMap,
Types: types,
HasScans: hs,
User: user,
}
ret.Collections()