From 4e5f54cf8f64b849bf2fbdd610012ebeb7786091 Mon Sep 17 00:00:00 2001
From: Steve Manuel <nilslice@gmail.com>
Date: Tue, 6 Dec 2016 09:54:14 -0800
Subject: removing ContentName() from editor.Editble and adding String() to
 content.Identifiable so embedded Items can manage display names by default,
 but easily overridden

---
 system/admin/config/config.go | 4 ++--
 system/admin/handlers.go      | 2 +-
 system/db/content.go          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'system')

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
 	}
-- 
cgit v1.2.3