diff options
| author | Terry Truong <terry06890@gmail.com> | 2023-01-14 11:26:10 +1100 |
|---|---|---|
| committer | Terry Truong <terry06890@gmail.com> | 2023-01-14 11:26:10 +1100 |
| commit | 21b5e5ee7bb933fa8235430aa63382b70dbe3d1b (patch) | |
| tree | e73cd119db59ce7a885273d455675d008cfd252d /backend | |
| parent | 3029a2f866b240856518cfa944b9e00ef37455db (diff) | |
Improve date display in info modal
Make desc field of EventInfo optional
Don't require desc in type=info result
Fix image not showing in info modal
Diffstat (limited to 'backend')
| -rwxr-xr-x | backend/histplorer.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/backend/histplorer.py b/backend/histplorer.py index 6822427..bf0d51e 100755 --- a/backend/histplorer.py +++ b/backend/histplorer.py @@ -92,7 +92,7 @@ class ImgInfo: return str(self.__dict__) class EventInfo: """ Used when responding to type=info requests """ - def __init__(self, event: Event, desc: str, wikiId: int, imgInfo: ImgInfo): + def __init__(self, event: Event, desc: str | None, wikiId: int, imgInfo: ImgInfo): self.event = event self.desc = desc self.wikiId = wikiId @@ -299,9 +299,9 @@ def lookupEventInfo(eventTitle: str, dbCur: sqlite3.Cursor) -> EventInfo | None: ' descs.desc, descs.wiki_id, ' \ ' images.url, images.license, images.artist, images.credit FROM events' \ ' INNER JOIN pop ON events.id = pop.id' \ - ' INNER JOIN descs ON events.id = descs.id' \ ' INNER JOIN event_imgs ON events.id = event_imgs.id' \ ' INNER JOIN images ON event_imgs.img_id = images.id' \ + ' LEFT JOIN descs ON events.id = descs.id' \ ' WHERE events.title = ? COLLATE NOCASE' row = dbCur.execute(query, (eventTitle,)).fetchone() if row is not None: |