diff --git a/commands/command.go b/commands/command.go
index 34a35ca2..59dbdc6b 100644
--- a/commands/command.go
+++ b/commands/command.go
@@ -109,6 +109,7 @@ func RegisterModel() {
new(models.TeamMember),
new(models.TeamRelationship),
new(models.Itemsets),
+ new(models.Comment),
)
gob.Register(models.Blog{})
gob.Register(models.Document{})
diff --git a/controllers/BookController.go b/controllers/BookController.go
index 30e6a916..2b9b9a00 100644
--- a/controllers/BookController.go
+++ b/controllers/BookController.go
@@ -516,7 +516,6 @@ func (c *BookController) Create() {
book.Identify = identify
book.DocCount = 0
book.MemberId = c.Member.MemberId
- book.CommentCount = 0
book.Version = time.Now().Unix()
book.IsEnableShare = 0
book.IsUseFirstDocument = 1
@@ -634,7 +633,6 @@ func (c *BookController) Import() {
book.Identify = identify
book.DocCount = 0
book.MemberId = c.Member.MemberId
- book.CommentCount = 0
book.Version = time.Now().Unix()
book.ItemId = itemId
diff --git a/controllers/CommentController.go b/controllers/CommentController.go
new file mode 100644
index 00000000..9cb4a3ca
--- /dev/null
+++ b/controllers/CommentController.go
@@ -0,0 +1,67 @@
+package controllers
+
+import (
+ "strings"
+ "time"
+
+ "github.com/astaxie/beego"
+
+ "github.com/mindoc-org/mindoc/conf"
+ "github.com/mindoc-org/mindoc/models"
+ "github.com/mindoc-org/mindoc/utils/pagination"
+)
+
+type CommentController struct {
+ BaseController
+}
+
+func (c *CommentController) Lists() {
+
+ docid, _ := c.GetInt("docid", 0)
+ pageIndex, _ := c.GetInt("page", 1)
+
+ beego.Info("CommentController.Lists", docid, pageIndex)
+
+ // 获取评论、分页
+ comments, count := models.NewComment().QueryCommentByDocumentId(docid, pageIndex, conf.PageSize)
+ page := pagination.PageUtil(int(count), pageIndex, conf.PageSize, comments)
+ beego.Info("docid=", docid, "Page", page)
+
+ var data struct {
+ DocId int `json:"doc_id"`
+ Page pagination.Page `json:"page"`
+ }
+ data.DocId = docid
+ data.Page = page
+
+ c.JsonResult(0, "ok", data)
+ return
+}
+
+func (c *CommentController) Create() {
+ content := c.GetString("content")
+ id, _ := c.GetInt("doc_id")
+
+ m := models.NewComment()
+ m.DocumentId = id
+ if len(c.Member.RealName) != 0 {
+ m.Author = c.Member.RealName
+ } else {
+ m.Author = c.Member.Account
+ }
+ m.MemberId = c.Member.MemberId
+ m.IPAddress = c.Ctx.Request.RemoteAddr
+ m.IPAddress = strings.Split(m.IPAddress, ":")[0]
+ m.CommentDate = time.Now()
+ m.Content = content
+ beego.Info(m)
+ m.Insert()
+
+ c.JsonResult(0, "ok")
+}
+
+func (c *CommentController) Index() {
+
+ c.Prepare()
+ c.TplName = "comment/index.tpl"
+}
diff --git a/controllers/DocumentController.go b/controllers/DocumentController.go
index 6ba30842..46448494 100644
--- a/controllers/DocumentController.go
+++ b/controllers/DocumentController.go
@@ -65,6 +65,15 @@ func (c *DocumentController) Index() {
c.Data["Content"] = template.HTML(doc.Release)
c.Data["Description"] = utils.AutoSummary(doc.Release, 120)
+ doc.IncrViewCount(doc.DocumentId)
+ c.Data["ViewCount"] = doc.ViewCount + 1
+ c.Data["DocumentId"] = doc.DocumentId
+
+ // 获取评论、分页
+ comments, count := models.NewComment().QueryCommentByDocumentId(doc.DocumentId, 1, conf.PageSize)
+ page := pagination.PageUtil(int(count), 1, conf.PageSize, comments)
+ c.Data["Page"] = page
+ beego.Info("docid=", doc.DocumentId, "Page", page)
}
} else {
c.Data["Title"] = "概要"
@@ -83,7 +92,6 @@ func (c *DocumentController) Index() {
}
c.Data["Model"] = bookResult
c.Data["Result"] = template.HTML(tree)
-
}
// 阅读文档
@@ -138,6 +146,7 @@ func (c *DocumentController) Read() {
doc.Processor()
+ c.Data["DocumentId"] = doc.DocumentId
attach, err := models.NewAttachment().FindListByDocumentId(doc.DocumentId)
if err == nil {
doc.AttachList = attach
@@ -146,19 +155,29 @@ func (c *DocumentController) Read() {
doc.IncrViewCount(doc.DocumentId)
c.Data["ViewCount"] = doc.ViewCount + 1
+ // 获取评论、分页
+ comments, count := models.NewComment().QueryCommentByDocumentId(doc.DocumentId, 1, conf.PageSize)
+ page := pagination.PageUtil(int(count), 1, conf.PageSize, comments)
+ c.Data["Page"] = page
+ beego.Info("docid=", doc.DocumentId, "Page", page)
+
if c.IsAjax() {
var data struct {
- DocTitle string `json:"doc_title"`
- Body string `json:"body"`
- Title string `json:"title"`
- Version int64 `json:"version"`
- ViewCount int `json:"view_count"`
+ DocTitle string `json:"doc_title"`
+ Body string `json:"body"`
+ Title string `json:"title"`
+ Version int64 `json:"version"`
+ ViewCount int `json:"view_count"`
+ DocId int `json:"doc_id"`
+ Page pagination.Page `json:"page"`
}
data.DocTitle = doc.DocumentName
data.Body = doc.Release
data.Title = doc.DocumentName + " - Powered by MinDoc"
data.Version = doc.Version
data.ViewCount = doc.ViewCount + 1
+ data.DocId = doc.DocumentId
+ data.Page = page
c.JsonResult(0, "ok", data)
}
diff --git a/controllers/comment.go b/controllers/comment.go
deleted file mode 100644
index ff70e555..00000000
--- a/controllers/comment.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package controllers
-
-type CommentController struct {
- BaseController
-}
-
-func (c *CommentController) Lists() {
-
-}
-
-func (c *CommentController) Create() {
-
- c.JsonResult(0, "ok")
-}
-
-func (c *CommentController) Index() {
- c.Prepare()
- c.TplName = "comment/index.tpl"
-}
diff --git a/models/BookResult.go b/models/BookResult.go
index 352a6b52..9fa31601 100644
--- a/models/BookResult.go
+++ b/models/BookResult.go
@@ -233,6 +233,17 @@ func (m *BookResult) ToBookResult(book Book) *BookResult {
m.ItemName = item.ItemName
}
}
+ if m.CommentStatus == "closed" {
+ m.IsDisplayComment = false
+ } else if m.CommentStatus == "open" {
+ m.IsDisplayComment = true
+ } else if m.CommentStatus == "registered_only" {
+ // todo
+ } else if m.CommentStatus == "group_only" {
+ // todo
+ } else {
+ m.IsDisplayComment = false;
+ }
return m
}
diff --git a/models/comment.go b/models/CommentModel.go
similarity index 89%
rename from models/comment.go
rename to models/CommentModel.go
index e99f8379..84a68100 100644
--- a/models/comment.go
+++ b/models/CommentModel.go
@@ -52,6 +52,7 @@ func (m *Comment) TableNameWithPrefix() string {
func NewComment() *Comment {
return &Comment{}
}
+
func (m *Comment) Find(id int) (*Comment, error) {
if id <= 0 {
return m, ErrInvalidParameter
@@ -62,6 +63,15 @@ func (m *Comment) Find(id int) (*Comment, error) {
return m, err
}
+// 根据文档id查询文档评论
+func (m *Comment) QueryCommentByDocumentId(doc_id, page, pagesize int) (comments []Comment, count int64) {
+ o := orm.NewOrm()
+ offset := (page - 1) * pagesize
+ o.QueryTable(m.TableNameWithPrefix()).Filter("document_id", doc_id).OrderBy("comment_date").Offset(offset).Limit(pagesize).All(&comments)
+ count, _ = o.QueryTable(m.TableNameWithPrefix()).Filter("document_id", doc_id).Count()
+ return
+}
+
func (m *Comment) Update(cols ...string) error {
o := orm.NewOrm()
diff --git a/static/js/kancloud.js b/static/js/kancloud.js
index 3363b395..7d80b40a 100644
--- a/static/js/kancloud.js
+++ b/static/js/kancloud.js
@@ -4,7 +4,6 @@ var events = function () {
window.sessionStorage && window.sessionStorage.setItem("MinDoc::LastLoadDocument:" + window.book.identify, $param.$id);
var prevState = window.history.state || {};
if ('pushState' in history) {
-
if ($param.$id) {
prevState.$id === $param.$id || window.history.pushState($param, $param.$id, $param.$url);
} else {
@@ -43,6 +42,86 @@ var events = function () {
}();
+function format(d) {
+ return d < 10 ? "0" + d : "" + d;
+}
+
+function timeFormat(time) {
+ var span = Date.parse(time)
+ var date = new Date(span)
+ var year = date.getFullYear();
+ var month = format(date.getMonth() + 1);
+ var day = format(date.getDate());
+ var hour = format(date.getHours());
+ var min = format(date.getMinutes());
+ var sec = format(date.getSeconds());
+ return year + "-" + month + "-" + day + " " + hour + ":" + min + ":" + sec;
+}
+
+function onPageClicked(page, docid) {
+ $.ajax({
+ url : "/comment/lists?page=" + page + "&docid=" + docid,
+ type : "GET",
+ beforeSend : function (xhr) {
+ NProgress.start();
+ },
+ success : function (res) {
+ console.log(res.data);
+ loadComment(res.data.page, res.data.doc_id);
+ },
+ complete : function () {
+ NProgress.done();
+ },
+ error : function () {
+ layer.msg("加载失败");
+ }
+ });
+}
+
+// 加载评论
+function loadComment(page, docid) {
+ $("#commentList").empty();
+ var html = ""
+ var c = page.List;
+ for (var i = 0; c && i < c.length; i++) {
+ html += "";
+ }
+ $("#commentList").append(html);
+
+ if (page.TotalPage > 1) {
+ $("#page").bootstrapPaginator({
+ currentPage: page.PageNo,
+ totalPages: page.TotalPage,
+ bootstrapMajorVersion: 3,
+ size: "middle",
+ onPageClicked: function(e,originalEvent,type,page){
+ onPageClicked(page, docid);
+ }
+ });
+ } else {
+ $("#page").find("li").remove();
+ }
+}
+
+// 重新渲染页面
+function renderPage(data) {
+ $("#page-content").html(data.body);
+ $("title").text(data.title);
+ $("#article-title").text(data.doc_title);
+ $("#article-info").text(data.doc_info);
+ $("#view_count").text("阅读次数：" + data.view_count);
+ $("#doc_id").val(data.doc_id);
+ loadComment(data.page, data.doc_id);
+}
+
/***
* 加载文档到阅读区
* @param $url
@@ -61,11 +140,7 @@ function loadDocument($url, $id, $callback) {
}else if(data.version && data.version != $callback){
return true;
}
- $("#page-content").html(data.body);
- $("title").text(data.title);
- $("#article-title").text(data.doc_title);
- $("#article-info").text(data.doc_info);
- $("#view_count").text("阅读次数：" + data.view_count);
+ renderPage(data);
events.trigger('article.open', {$url: $url, $id: $id});
@@ -77,23 +152,13 @@ function loadDocument($url, $id, $callback) {
},
success : function (res) {
if (res.errcode === 0) {
- var body = res.data.body;
- var doc_title = res.data.doc_title;
- var title = res.data.title;
- var doc_info = res.data.doc_info;
- var view_count = res.data.view_count;
+ renderPage(res.data);
- $body = body;
+ $body = res.data.body;
if (typeof $callback === "function" ) {
$body = $callback(body);
}
- $("#page-content").html($body);
- $("title").text(title);
- $("#article-title").text(doc_title);
- $("#article-info").text(doc_info);
- $("#view_count").text("阅读次数：" + view_count);
-
events.data($id, res.data);
events.trigger('article.open', { $url : $url, $id : $id });
@@ -129,9 +194,6 @@ function initHighlighting() {
}
}
-
-
-
$(function () {
$(".view-backtop").on("click", function () {
$('.manual-right').animate({ scrollTop: '0px' }, 200);
diff --git a/utils/pagination/pagination.go b/utils/pagination/pagination.go
index f6dcec43..e5fc93d9 100644
--- a/utils/pagination/pagination.go
+++ b/utils/pagination/pagination.go
@@ -112,3 +112,28 @@ func (p *Pagination) pageURL(page string) string {
return u.String()
}
+type Page struct {
+ PageNo int `json:"PageNo"`
+ PageSize int `json:"PageSize"`
+ TotalPage int `json:"TotalPage"`
+ TotalCount int `json:"TotalCount"`
+ FirstPage bool `json:"FirstPage"`
+ LastPage bool `json:"LastPage"`
+ List interface{} `json:"List"`
+}
+
+func PageUtil(count int, pageNo int, pageSize int, list interface{}) Page {
+ tp := count / pageSize
+ if count%pageSize > 0 {
+ tp = count/pageSize + 1
+ }
+ return Page {
+ PageNo: pageNo,
+ PageSize: pageSize,
+ TotalPage: tp,
+ TotalCount: count,
+ FirstPage: pageNo == 1,
+ LastPage: pageNo == tp,
+ List: list,
+ }
+}
diff --git a/views/book/setting.tpl b/views/book/setting.tpl
index 154c819c..70a665ef 100644
--- a/views/book/setting.tpl
+++ b/views/book/setting.tpl
@@ -93,6 +93,23 @@
+
{{if eq .Model.PrivatelyOwned 1}}
diff --git a/views/document/default_read.tpl b/views/document/default_read.tpl
index 27a47d42..58637df2 100644
--- a/views/document/default_read.tpl
+++ b/views/document/default_read.tpl
@@ -168,61 +168,51 @@
+
{{.Content}}
-
+
{{end}}
-*/}}-->
+
+
@@ -247,7 +237,7 @@
@@ -276,7 +266,7 @@
@@ -290,6 +280,7 @@
+
@@ -299,6 +290,18 @@
{{.Scripts}}
{{$c.Author}}{{date $c.CommentDate "Y-m-d H:i:s"}}
++ + {{$i}}# + +
静夜思9月1日评论
-- - - 4 - - - 回复 - - - 23# - -
+ {{end}} ++ + +