diff options
author | Steve Manuel <nilslice@gmail.com> | 2016-12-06 09:54:14 -0800 |
---|---|---|
committer | Steve Manuel <nilslice@gmail.com> | 2016-12-06 09:54:14 -0800 |
commit | 4e5f54cf8f64b849bf2fbdd610012ebeb7786091 (patch) | |
tree | 6fd9394a1b5a4733a7d20067b8c588ee5fcd8fc4 /system | |
parent | 40b5cfe2289b179c511a6c73757bb64228f0bc82 (diff) |
removing ContentName() from editor.Editble and adding String() to content.Identifiable so embedded Items can manage display names by default, but easily overridden
Diffstat (limited to 'system')
-rw-r--r-- | system/admin/config/config.go | 4 | ||||
-rw-r--r-- | system/admin/handlers.go | 2 | ||||
-rw-r--r-- | system/db/content.go | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/system/admin/config/config.go b/system/admin/config/config.go index 0a7103e..b898b49 100644 --- a/system/admin/config/config.go +++ b/system/admin/config/config.go @@ -18,8 +18,8 @@ type Config struct { CacheInvalidate []string `json:"cache"` } -// ContentName partially implements editor.Editable -func (c *Config) ContentName() string { return c.Name } +// String partially implements content.Identifiable and overrides Item's String() +func (c *Config) String() string { return c.Name } // Editor partially implements editor.Editable func (c *Config) Editor() *editor.Editor { return &c.editor } diff --git a/system/admin/handlers.go b/system/admin/handlers.go index 247cca7..7ea018c 100644 --- a/system/admin/handlers.go +++ b/system/admin/handlers.go @@ -1071,7 +1071,7 @@ func adminPostListItem(e editor.Editable, typeName, status string) []byte { post := ` <li class="col s12"> - <a href="/admin/edit?type=` + typeName + `&status=` + strings.TrimPrefix(status, "_") + `&id=` + cid + `">` + e.ContentName() + `</a> + <a href="/admin/edit?type=` + typeName + `&status=` + strings.TrimPrefix(status, "_") + `&id=` + cid + `">` + i.String() + `</a> <span class="post-detail">Updated: ` + updatedTime + `</span> <span class="publish-date right">` + publishTime + `</span> diff --git a/system/db/content.go b/system/db/content.go index 76d95c5..b2ba87a 100644 --- a/system/db/content.go +++ b/system/db/content.go @@ -418,7 +418,7 @@ func postToJSON(ns string, data url.Values) ([]byte, error) { return nil, err } - slug, err := manager.Slug(post.(editor.Editable)) + slug, err := manager.Slug(post.(content.Identifiable)) if err != nil { return nil, err } |