From 1aa76bd27913e40780aa66fe6b6c1158e20b7bef Mon Sep 17 00:00:00 2001
From: Unknwon <joe2010xtmf@163.com>
Date: Wed, 8 Oct 2014 18:29:18 -0400
Subject: Fix #532, add system notice

---
 routers/admin/notice.go | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 routers/admin/users.go  |  4 ++--
 2 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 routers/admin/notice.go

(limited to 'routers')

diff --git a/routers/admin/notice.go b/routers/admin/notice.go
new file mode 100644
index 0000000000..b431946366
--- /dev/null
+++ b/routers/admin/notice.go
@@ -0,0 +1,46 @@
+// Copyright 2014 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package admin
+
+import (
+	"github.com/Unknwon/com"
+
+	"github.com/gogits/gogs/models"
+	"github.com/gogits/gogs/modules/base"
+	"github.com/gogits/gogs/modules/log"
+	"github.com/gogits/gogs/modules/middleware"
+)
+
+const (
+	NOTICES base.TplName = "admin/notice"
+)
+
+func Notices(ctx *middleware.Context) {
+	ctx.Data["Title"] = ctx.Tr("admin.notices")
+	ctx.Data["PageIsAdmin"] = true
+	ctx.Data["PageIsAdminNotices"] = true
+
+	pageNum := 50
+	p := pagination(ctx, models.CountNotices(), pageNum)
+
+	notices, err := models.GetNotices(pageNum, (p-1)*pageNum)
+	if err != nil {
+		ctx.Handle(500, "GetNotices", err)
+		return
+	}
+	ctx.Data["Notices"] = notices
+	ctx.HTML(200, NOTICES)
+}
+
+func DeleteNotice(ctx *middleware.Context) {
+	id := com.StrTo(ctx.Params(":id")).MustInt64()
+	if err := models.DeleteNotice(id); err != nil {
+		ctx.Handle(500, "DeleteNotice", err)
+		return
+	}
+	log.Trace("System notice deleted by admin(%s): %d", ctx.User.Name, id)
+	ctx.Flash.Success(ctx.Tr("admin.notices.delete_success"))
+	ctx.Redirect("/admin/notices")
+}
diff --git a/routers/admin/users.go b/routers/admin/users.go
index fc3b0cbce0..e5cd364f3a 100644
--- a/routers/admin/users.go
+++ b/routers/admin/users.go
@@ -48,12 +48,12 @@ func Users(ctx *middleware.Context) {
 	pageNum := 50
 	p := pagination(ctx, models.CountUsers(), pageNum)
 
-	var err error
-	ctx.Data["Users"], err = models.GetUsers(pageNum, (p-1)*pageNum)
+	users, err := models.GetUsers(pageNum, (p-1)*pageNum)
 	if err != nil {
 		ctx.Handle(500, "GetUsers", err)
 		return
 	}
+	ctx.Data["Users"] = users
 	ctx.HTML(200, USERS)
 }
 
-- 
cgit v1.2.3