eessppeelllloo/listmonk
1
0
Fork 0
mirror of https://github.com/knadh/listmonk.git synced 2025-12-05 16:00:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix compatibility issues with master.

Browse Source 
- Fix merge conflicts.
- Simply logic in campaign preview handler.
- Remove redundant `GetCampaignForPreviewWithTemplate()` and switch to the old
  query that optionally takes a template.
- Fix Vue linting issues.
This commit is contained in:
Kailash Nadh
2025-04-06 19:23:51 +05:30
parent 82e2b705bd
commit c1f81cfadd
8 changed files with 61 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
models/models.go
View File

@@ -234,11 +234,11 @@ type Campaign struct {
ContentType string `db:"content_type" json:"content_type"`
Tags pq.StringArray `db:"tags" json:"tags"`
Headers Headers `db:"headers" json:"headers"`
TemplateID null.Int64 `db:"template_id" json:"template_id"`
TemplateID null.Int `db:"template_id" json:"template_id"`
Messenger string `db:"messenger" json:"messenger"`
Archive bool `db:"archive" json:"archive"`
ArchiveSlug null.String `db:"archive_slug" json:"archive_slug"`
ArchiveTemplateID null.Int64 `db:"archive_template_id" json:"archive_template_id"`
ArchiveTemplateID null.Int `db:"archive_template_id" json:"archive_template_id"`
ArchiveMeta json.RawMessage `db:"archive_meta" json:"archive_meta"`
// TemplateBody is joined in from templates by the next-campaigns query.