Merge pull request goplus#17 from Baihhh/merge

fix: upload picture & edit
xhyqaq · Jan 22, 2024 · 8d8b195 · 8d8b195
2 parents 5d23634 + 14f3579
commit 8d8b195
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 2,043 deletions.
diff --git a/cmd/gopcomm/community_yap.gox b/cmd/gopcomm/community_yap.gox
@@ -156,25 +156,12 @@ get "/edit/:id", ctx => {
  }
  // uid := "70f6a615-c0d5-4315-a5ac-34ca845450ed"
  id := ctx.param("id")
- //doc := {
- // "ID": id,
- //}
  if id != "" {
  if editable, _ := community.canEditable(todo, uid, id); !editable {
- // TODO: can't edit this article
  zlog.Error("no permissions")
- ctx.json {
- "code": 403,
- "err": "no permissions",
- }
+ http.Redirect(ctx.ResponseWriter, ctx.Request, "/error", http.StatusTemporaryRedirect)
  }
  article, _ := community.article(todo, id)
- // doc["Title"] = article.Title
- // doc["Content"] = article.Content
- // doc["Tags"] = article.Tags
- // doc["Cover"] = article.Cover
- // doc["Ctime"] = article.Ctime
- // doc["User"] = article.User
  ctx.yap "edit", article
  }
 }
@@ -247,7 +234,6 @@ post "/translate", ctx => {
  "err": "no token",
  }
  }
-
  uid, err := community.GetUserId(token.Value)
  if err != nil {
  ctx.json {

diff --git a/cmd/gopcomm/yap/edit_yap.html b/cmd/gopcomm/yap/edit_yap.html
@@ -4,7 +4,7 @@
  <meta charset="UTF-8" />
  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
  <title>Markdown</title>
- <script type="module" crossorigin src="/assets/index-KOgtDMdL.js"></script>
+ <script type="module" crossorigin src="/assets/index-kBFUOeCi.js"></script>
  <link rel="stylesheet" crossorigin href="/assets/index-oISNCb2V.css">
  </head>
  <body>

diff --git a/cmd/gopcomm/yap/static/assets/index-iHukN-OO.js b/cmd/gopcomm/yap/static/assets/index-iHukN-OO.js
diff --git a/...pcomm/yap/static/assets/index-KOgtDMdL.js → ...pcomm/yap/static/assets/index-kBFUOeCi.js b/...pcomm/yap/static/assets/index-KOgtDMdL.js → ...pcomm/yap/static/assets/index-kBFUOeCi.js
diff --git a/internal/core/community.go b/internal/core/community.go
@@ -122,7 +122,6 @@ func (p *Community) Article(ctx context.Context, id string) (article *Article, e
  // return
  // }
  // article.User = *user
-
  // get html url
  fileKey, err := p.GetMediaUrl(ctx, htmlId)
  article.HtmlUrl = fmt.Sprintf("%s%s", p.domain, fileKey)
@@ -327,11 +326,11 @@ func (p *Community) SearchArticle(ctx context.Context, searchValue string) (item
  return []*ArticleEntry{}, err
  }
  // add author info
- user, err := p.GetUser(article.UId)
- if err != nil {
- return []*ArticleEntry{}, err
- }
- article.User = *user
+ // user, err := p.GetUser(article.UId)
+ // if err != nil {
+ //  return []*ArticleEntry{}, err
+ // }
+ // article.User = *user
 
  items = append(items, article)
  }

diff --git a/internal/core/user.go b/internal/core/user.go
@@ -2,7 +2,6 @@ package core
 
 import (
  "os"
-
  "github.com/casdoor/casdoor-go-sdk/casdoorsdk"
 )