Merge pull request #29 from xushiwei/q

edit
goplus · Jan 10, 2024 · 37dc524 · 37dc524
2 parents 0f88a42 + 4a1c497
commit 37dc524
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 23 deletions.
diff --git a/cmd/gopcomm/community_yap.gox b/cmd/gopcomm/community_yap.gox
@@ -14,7 +14,7 @@ get "/p/:id", ctx => {
  ctx.yap "article", {
  "ID": id,
  "Title": article.Title,
- "Body": string(html),
+ "Body": html,
  }
 }
 get "/", ctx => {
@@ -24,10 +24,21 @@ get "/", ctx => {
  }
 }
 get "/edit", ctx => {
- // canEditable
- ctx.yap "edit", {
- "ID": ctx.param("id"),
+ uid := ""
+ id := ctx.param("id")
+ doc := {
+ "ID": id,
+ }
+ if id != "" {
+ if editable, _ := community.canEditable(nil, uid, id); !editable {
+ // TODO: can't edit this article
+ return
+ }
+ article, _ := community.article(nil, id)
+ doc["Title"] = article.Title
+ doc["Content"] = article.Content
  }
+ ctx.yap "edit", doc
 }
 post "/commit", ctx => {
  // ...

diff --git a/cmd/gopcomm/gop_autogen.go b/cmd/gopcomm/gop_autogen.go
@@ -21,7 +21,7 @@ func (this *community) MainEntry() {
 //line cmd/gopcomm/community_yap.gox:13:1
  html, _ := markdown.Render(article.Content)
 //line cmd/gopcomm/community_yap.gox:14:1
- ctx.Yap__1("article", map[string]string{"ID": id, "Title": article.Title, "Body": string(html)})
+ ctx.Yap__1("article", map[string]string{"ID": id, "Title": article.Title, "Body": html})
  })
 //line cmd/gopcomm/community_yap.gox:20:1
  this.Get("/", func(ctx *yap.Context) {
@@ -32,17 +32,39 @@ func (this *community) MainEntry() {
  })
 //line cmd/gopcomm/community_yap.gox:26:1
  this.Get("/edit", func(ctx *yap.Context) {
+//line cmd/gopcomm/community_yap.gox:27:1
+ uid := ""
 //line cmd/gopcomm/community_yap.gox:28:1
- ctx.Yap__1("edit", map[string]string{"ID": ctx.Param("id")})
- })
+ id := ctx.Param("id")
+//line cmd/gopcomm/community_yap.gox:29:1
+ doc := map[string]string{"ID": id}
 //line cmd/gopcomm/community_yap.gox:32:1
+ if id != "" {
+//line cmd/gopcomm/community_yap.gox:33:1
+ if
+//line cmd/gopcomm/community_yap.gox:33:1
+ editable, _ := this.community.CanEditable(nil, uid, id); !editable {
+//line cmd/gopcomm/community_yap.gox:35:1
+ return
+ }
+//line cmd/gopcomm/community_yap.gox:37:1
+ article, _ := this.community.Article(nil, id)
+//line cmd/gopcomm/community_yap.gox:38:1
+ doc["Title"] = article.Title
+//line cmd/gopcomm/community_yap.gox:39:1
+ doc["Content"] = article.Content
+ }
+//line cmd/gopcomm/community_yap.gox:41:1
+ ctx.Yap__1("edit", doc)
+ })
+//line cmd/gopcomm/community_yap.gox:43:1
  this.Post("/commit", func(ctx *yap.Context) {
  })
-//line cmd/gopcomm/community_yap.gox:36:1
+//line cmd/gopcomm/community_yap.gox:47:1
  config := &core.Config{}
-//line cmd/gopcomm/community_yap.gox:37:1
+//line cmd/gopcomm/community_yap.gox:48:1
  this.community, _ = core.New(config)
-//line cmd/gopcomm/community_yap.gox:39:1
+//line cmd/gopcomm/community_yap.gox:50:1
  this.Run__1(":8080")
 }
 func main() {

diff --git a/cmd/gopcomm/yap/edit_yap.html b/cmd/gopcomm/yap/edit_yap.html
@@ -3,6 +3,11 @@
 <meta charset="utf-8"/>
 </head>
 <body>
-Edit {{.ID}}
+<form action="/commit" method="post">
+<input type="hidden" name="id" value="{{.ID}}">
+<p><input type="text" name="title" value="{{.Title}}"></p>
+<p><textarea name="content" rows="10" cols="30">{{.Content}}</textarea></p>
+<p><input type="submit" value="Submit"></p>
+</form>
 </body>
 </html>
diff --git a/internal/core/community.gop b/internal/core/community.gop
@@ -39,7 +39,7 @@ type ArticleEntry struct {
 
 type Article struct {
  ArticleEntry
- Content []byte // in markdown
+ Content string // in markdown
 }
 
 type Community struct {
@@ -64,7 +64,7 @@ func (p *Community) Article(ctx context.Context, id string) (article *Article, e
  ID: id,
  Title: "Title",
  },
- []byte(contentSummary),
+ contentSummary,
  }
  return
  }
@@ -73,7 +73,7 @@ func (p *Community) Article(ctx context.Context, id string) (article *Article, e
 
 // CanEditable
 func (p *Community) CanEditable(ctx context.Context, uid, id string) (editable bool, err error) {
- return
+ return true, nil
 }
 
 // PutArticle adds new article (ID == "") or edits an existing article (ID != "").

diff --git a/internal/core/gop_autogen.go b/internal/core/gop_autogen.go
@@ -17,7 +17,7 @@ type ArticleEntry struct {
 }
 type Article struct {
  ArticleEntry
- Content []byte
+ Content string
 }
 type Community struct {
 }
@@ -41,7 +41,7 @@ func (p *Community) Article(ctx context.Context, id string) (article *Article, e
 //line internal/core/community.gop:61:1
  if id == "123" {
 //line internal/core/community.gop:62:1
- article = &Article{ArticleEntry{ID: id, Title: "Title"}, []byte(contentSummary)}
+ article = &Article{ArticleEntry{ID: id, Title: "Title"}, contentSummary}
 //line internal/core/community.gop:69:1
  return
  }
@@ -53,7 +53,7 @@ func (p *Community) Article(ctx context.Context, id string) (article *Article, e
 //line internal/core/community.gop:75:1
 func (p *Community) CanEditable(ctx context.Context, uid string, id string) (editable bool, err error) {
 //line internal/core/community.gop:76:1
- return
+ return true, nil
 }
 // PutArticle adds new article (ID == "") or edits an existing article (ID != "").
 //
@@ -85,16 +85,17 @@ func (p *Community) ListArticle(ctx context.Context, from string, limit int) (it
 //
 //line internal/core/media.gop:6:1
 func (p *Community) PutMedia(ctx context.Context, uid string, media []byte) (id string, err error) {
+//line internal/core/media.gop:7:1
  return
 }
-//line internal/core/media.gop:9:1
-func (p *Community) DeleteMedia(ctx context.Context, uid string, id string) (err error) {
 //line internal/core/media.gop:10:1
+func (p *Community) DeleteMedia(ctx context.Context, uid string, id string) (err error) {
+//line internal/core/media.gop:11:1
  return
 }
-//line internal/core/media.gop:13:1
-func (p *Community) MediaURL(id string) (url string) {
 //line internal/core/media.gop:14:1
+func (p *Community) MediaURL(id string) (url string) {
+//line internal/core/media.gop:15:1
  return
 }
 //line internal/core/community.gop:48:1

diff --git a/markdown/gop_autogen.go b/markdown/gop_autogen.go
@@ -2,7 +2,7 @@ package markdown
 // Render renders a markdown text into html.
 //
 //line markdown/render.gop:20:1
-func Render(md []byte) (html []byte, err error) {
+func Render(md string) (html string, err error) {
 //line markdown/render.gop:21:1
  return md, nil
 }
diff --git a/markdown/render.gop b/markdown/render.gop
@@ -17,6 +17,6 @@
 package markdown
 
 // Render renders a markdown text into html.
-func Render(md []byte) (html []byte, err error) {
+func Render(md string) (html string, err error) {
  return md, nil
 }