Fix #532, add system notice

models/admin.go

@@ -0,0 +1,64 @@
+// 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 models
+
+import (
+	"time"
+
+	"github.com/Unknwon/com"
+)
+
+type NoticeType int
+
+const (
+	NOTICE_REPOSITORY NoticeType = iota + 1
+)
+
+// Notice represents a system notice for admin.
+type Notice struct {
+	Id          int64
+	Type        NoticeType
+	Description string    `xorm:"TEXT"`
+	Created     time.Time `xorm:"CREATED"`
+}
+
+// TrStr returns a translation format string.
+func (n *Notice) TrStr() string {
+	return "admin.notices.type_" + com.ToStr(n.Type)
+}
+
+// CreateNotice creates new system notice.
+func CreateNotice(tp NoticeType, desc string) error {
+	n := &Notice{
+		Type:        tp,
+		Description: desc,
+	}
+	_, err := x.Insert(n)
+	return err
+}
+
+// CreateRepositoryNotice creates new system notice with type NOTICE_REPOSITORY.
+func CreateRepositoryNotice(desc string) error {
+	return CreateNotice(NOTICE_REPOSITORY, desc)
+}
+
+// CountNotices returns number of notices.
+func CountNotices() int64 {
+	count, _ := x.Count(new(Notice))
+	return count
+}
+
+// GetNotices returns given number of notices with offset.
+func GetNotices(num, offset int) ([]*Notice, error) {
+	notices := make([]*Notice, 0, num)
+	err := x.Limit(num, offset).Desc("id").Find(&notices)
+	return notices, err
+}
+
+// DeleteNotice deletes a system notice by given ID.
+func DeleteNotice(id int64) error {
+	_, err := x.Id(id).Delete(new(Notice))
+	return err
+}

models/models.go

@@ -32,12 +32,12 @@ var (
 )
 
 func init() {
-	tables = append(tables, new(User), new(PublicKey),
+	tables = append(tables, new(User), new(PublicKey), new(Follow), new(Oauth2),
 		new(Repository), new(Watch), new(Star), new(Action), new(Access),
-		new(Issue), new(Comment), new(Oauth2), new(Follow),
-		new(Mirror), new(Release), new(LoginSource), new(Webhook), new(IssueUser),
-		new(Milestone), new(Label), new(HookTask), new(Team), new(OrgUser), new(TeamUser),
-		new(UpdateTask), new(Attachment))
+		new(Issue), new(Comment), new(Attachment), new(IssueUser), new(Label), new(Milestone),
+		new(Mirror), new(Release), new(LoginSource), new(Webhook),
+		new(UpdateTask), new(HookTask), new(Team), new(OrgUser), new(TeamUser),
+		new(Notice))
 }
 
 func LoadModelsConfig() {

models/repo.go

@@ -934,9 +934,14 @@ func DeleteRepository(uid, repoId int64, userName string) error {
 		sess.Rollback()
 		return err
 	}
+
+	// Remove repository files.
 	if err = os.RemoveAll(RepoPath(userName, repo.Name)); err != nil {
-		sess.Rollback()
-		return err
+		desc := fmt.Sprintf("Fail to delete repository files(%s/%s): %v", userName, repo.Name, err)
+		log.Warn(desc)
+		if err = CreateRepositoryNotice(desc); err != nil {
+			log.Error(4, "Fail to add notice: %v", err)
+		}
 	}
 	return sess.Commit()
 }