Followup to pinned Issues

custom/conf/app.example.ini

@@ -1048,7 +1048,7 @@ LEVEL = Info
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; List of reasons why a Pull Request or Issue can be locked
 ;LOCK_REASONS = Too heated,Off-topic,Resolved,Spam
-;; Maximum number of pinned Issues
+;; Maximum number of pinned Issues per repo
 ;; Set to 0 to disable pinning Issues
 ;MAX_PINNED = 3
 

docs/content/doc/administration/config-cheat-sheet.en-us.md

@@ -141,7 +141,7 @@ In addition there is _`StaticRootPath`_ which can be set as a built-in at build
 ### Repository - Issue (`repository.issue`)
 
 - `LOCK_REASONS`: **Too heated,Off-topic,Resolved,Spam**: A list of reasons why a Pull Request or Issue can be locked
-- `MAX_PINNED`: **3**: Maximum number of pinned Issues. Set to 0 to disable pinning Issues.
+- `MAX_PINNED`: **3**: Maximum number of pinned Issues per Repo. Set to 0 to disable pinning Issues.
 
 ### Repository - Upload (`repository.upload`)
 

models/issues/issue.go

@@ -707,7 +707,7 @@ func (issue *Issue) Pin(ctx context.Context, user *user_model.User) error {
 
 	// Check if the maximum allowed Pins reached
 	if maxPin >= setting.Repository.Issue.MaxPinned {
-		return fmt.Errorf("You have reached the max number of pinned Issues")
+		return util.NewInvalidArgumentErrorf("You have reached the max number of pinned Issues")
 	}
 
 	_, err = db.GetEngine(ctx).Table("issue").
@@ -856,10 +856,15 @@ func GetPinnedIssues(ctx context.Context, repoID int64, isPull bool) ([]*Issue,
 // IsNewPinnedAllowed returns if a new Issue or Pull request can be pinned
 func IsNewPinAllowed(ctx context.Context, repoID int64, isPull bool) (bool, error) {
 	var maxPin int
-	_, err := db.GetEngine(ctx).SQL("SELECT MAX(pin_order) FROM issue WHERE repo_id = ? AND is_pull = ?", repoID, isPull).Get(&maxPin)
+	_, err := db.GetEngine(ctx).SQL("SELECT COUNT(pin_order) FROM issue WHERE repo_id = ? AND is_pull = ? AND pin_order > 0", repoID, isPull).Get(&maxPin)
 	if err != nil {
 		return false, err
 	}
 
 	return maxPin < setting.Repository.Issue.MaxPinned, nil
 }
+
+// IsErrIssueMaxPinReached returns if the error is, that the User can't pin more Issues
+func IsErrIssueMaxPinReached(err error) bool {
+	return err.Error() == "You have reached the max number of pinned Issues"
+}

routers/api/v1/repo/issue_pin.go

@@ -45,6 +45,8 @@ func PinIssue(ctx *context.APIContext) {
 	if err != nil {
 		if issues_model.IsErrIssueNotExist(err) {
 			ctx.NotFound()
+		} else if issues_model.IsErrIssueMaxPinReached(err) {
+			ctx.Error(http.StatusBadGateway, "MaxPinReached", err)
 		} else {
 			ctx.Error(http.StatusInternalServerError, "GetIssueByIndex", err)
 		}

routers/web/repo/issue_pin.go

@@ -33,9 +33,9 @@ func IssuePinOrUnpin(ctx *context.Context) {
 
 // IssueUnpin unpins a Issue
 func IssueUnpin(ctx *context.Context) {
-	issue, err := issues_model.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":id"))
+	issue, err := issues_model.GetIssueByID(ctx, ctx.ParamsInt64(":id"))
 	if err != nil {
-		ctx.Status(http.StatusNoContent)
+		ctx.Status(http.StatusInternalServerError)
 		return
 	}
 

routers/web/web.go

@@ -1026,7 +1026,7 @@ func registerRoutes(m *web.Route) {
 			m.Post("/attachments", repo.UploadIssueAttachment)
 			m.Post("/attachments/remove", repo.DeleteAttachment)
 			m.Delete("/unpin/{id}", reqRepoAdmin, repo.IssueUnpin)
-			m.Post("/pin_move", reqRepoAdmin, repo.IssuePinMove)
+			m.Post("/move_pin", reqRepoAdmin, repo.IssuePinMove)
 		}, context.RepoMustNotBeArchived())
 		m.Group("/comments/{id}", func() {
 			m.Post("", repo.UpdateCommentContent)

templates/repo/issue/list.tmpl

@@ -6,7 +6,7 @@
 	{{if .PinnedIssues}}
 		<div id="issue-pins" {{if .IsRepoAdmin}}data-is-repo-admin{{end}}>
 			{{range .PinnedIssues}}
-				<div class="pinned-issue-card gt-word-break" data-move-url="{{$.Link}}/pin_move" data-issue-id="{{.ID}}">
+				<div class="pinned-issue-card gt-word-break" data-move-url="{{$.Link}}/move_pin" data-issue-id="{{.ID}}">
 					{{if eq $.Project.CardType 1}}
 						<div class="card-attachment-images">
 							{{range (index $.issuesAttachmentMap .ID)}}

web_src/css/repo.css

@@ -3402,11 +3402,11 @@ tbody.commit-list {
   background: var(--color-card);
 }
 
-.pinned-issue-card .meta a {
+.pinned-issue-card a {
   color: inherit;
 }
 
-.pinned-issue-card .meta a:hover {
+.pinned-issue-card a:hover {
   color: var(--color-primary);
 }