JavaCodeMood
diff --git a/‎controllers/LabelController.go‎
Lines changed: 5 additions & 19 deletions b/‎controllers/LabelController.go‎
Lines changed: 5 additions & 19 deletions
diff --git a/‎controllers/LocalhostController.go‎
Lines changed: 4 additions & 4 deletions b/‎controllers/LocalhostController.go‎
Lines changed: 4 additions & 4 deletions
@@ -34,38 +34,26 @@ func (this *LabelController) Index() {
 	if labelName == "" {
 		this.Abort("404")
 	}
-	//_, err := models.NewLabel().FindFirst("label_name", labelName)
-	//
-	//if err != nil {
-	//	if err == orm.ErrNoRows {
-	//		this.Abort("404")
-	//	} else {
-	//		beego.Error(err)
-	//		this.Abort("500")
-	//	}
-	//}
-
 	pageSize := 24
-	member_id := 0
+	memberId := 0
 	if this.Member != nil {
-		member_id = this.Member.MemberId
+		memberId = this.Member.MemberId
 	}
-	search_result, totalCount, err := models.NewBook().FindForLabelToPager(labelName, pageIndex, pageSize, member_id)
+	searchResult, totalCount, err := models.NewBook().FindForLabelToPager(labelName, pageIndex, pageSize, memberId)
 
 	if err != nil {
 		beego.Error(err)
 		return
 	}
+
 	if totalCount > 0 {
 		html := utils.NewPaginations(conf.RollPage, totalCount, pageSize, pageIndex, beego.URLFor("LabelController.Index", ":key", labelName), "")
 		this.Data["PageHtml"] = html
 	} else {
 		this.Data["PageHtml"] = ""
 	}
-	this.Data["Lists"] = search_result
-
+	this.Data["Lists"] = searchResult
 	this.Data["LabelName"] = labelName
-
 	this.GetSeoByPage("label_list", map[string]string{
 		"title":       "[标签]" + labelName,
 		"keywords":    "标签," + labelName,
@@ -82,7 +70,6 @@ func (this *LabelController) List() {
 	pageSize := 200
 
 	labels, totalCount, err := models.NewLabel().FindToPager(pageIndex, pageSize)
-
 	if err != nil {
 		this.ShowErrorPage(50001, err.Error())
 	}
@@ -95,7 +82,6 @@ func (this *LabelController) List() {
 	this.Data["TotalPages"] = int(math.Ceil(float64(totalCount) / float64(pageSize)))
 
 	this.Data["Labels"] = labels
-
 	this.GetSeoByPage("label_list", map[string]string{
 		"title":       "标签",
 		"keywords":    "标签",
 
@@ -38,11 +38,11 @@ func (this *LocalhostController) RenderMarkdown() {
 				//这里要指定更新字段，否则markdown内容会被置空
 				ModelStore.InsertOrUpdate(models.DocumentStore{DocumentId: id, Content: content}, "content")
 				this.JsonResult(0, "成功")
-			} else {
-				this.Data["Markdown"] = ModelStore.GetFiledById(id, "markdown")
-				this.TplName = "widgets/render.html"
-				return
 			}
+
+			this.Data["Markdown"] = ModelStore.GetFiledById(id, "markdown")
+			this.TplName = "widgets/render.html"
+			return
 		}
 	}
 	this.Abort("404")
Original file line number	Diff line number	Diff line change
`@@ -38,11 +38,11 @@ func (this *LocalhostController) RenderMarkdown() {`
`38`	`38`	`//这里要指定更新字段，否则markdown内容会被置空`
`39`	`39`	`ModelStore.InsertOrUpdate(models.DocumentStore{DocumentId: id, Content: content}, "content")`
`40`	`40`	`this.JsonResult(0, "成功")`
`41`		`- } else {`
`42`		`- this.Data["Markdown"] = ModelStore.GetFiledById(id, "markdown")`
`43`		`- this.TplName = "widgets/render.html"`
`44`		`- return`
`45`	`41`	`}`
	`42`	`+`
	`43`	`+ this.Data["Markdown"] = ModelStore.GetFiledById(id, "markdown")`
	`44`	`+ this.TplName = "widgets/render.html"`
	`45`	`+ return`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`	`this.Abort("404")`