Skip to content

Commit e4e059c

Browse files
committed
Fix Collection property serialization on API
Use standard string instead of sql.NullString for `style_sheet`, `script`, and `signature`. Addresses writefreely#820
1 parent 3e7d236 commit e4e059c

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

collections.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,9 @@ type (
114114
Alias *string `schema:"alias" json:"alias"`
115115
Title *string `schema:"title" json:"title"`
116116
Description *string `schema:"description" json:"description"`
117-
StyleSheet *sql.NullString `schema:"style_sheet" json:"style_sheet"`
118-
Script *sql.NullString `schema:"script" json:"script"`
119-
Signature *sql.NullString `schema:"signature" json:"signature"`
117+
StyleSheet *string `schema:"style_sheet" json:"style_sheet"`
118+
Script *string `schema:"script" json:"script"`
119+
Signature *string `schema:"signature" json:"signature"`
120120
Monetization *string `schema:"monetization_pointer" json:"monetization_pointer"`
121121
Verification *string `schema:"verification_link" json:"verification_link"`
122122
LetterReply *string `schema:"letter_reply" json:"letter_reply"`

database.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -905,9 +905,9 @@ func (db *datastore) UpdateCollection(app *App, c *SubmittedCollection, alias st
905905
q := query.NewUpdate().
906906
SetStringPtr(c.Title, "title").
907907
SetStringPtr(c.Description, "description").
908-
SetNullString(c.StyleSheet, "style_sheet").
909-
SetNullString(c.Script, "script").
910-
SetNullString(c.Signature, "post_signature")
908+
SetStringPtr(c.StyleSheet, "style_sheet").
909+
SetStringPtr(c.Script, "script").
910+
SetStringPtr(c.Signature, "post_signature")
911911

912912
if c.Format != nil {
913913
cf := &CollectionFormat{Format: c.Format.String}

0 commit comments

Comments
 (0)