Add weight to api

Only show comments when weight is enabled

Author: maantje

modules/structs/issue.go

@@ -80,6 +80,7 @@ type Issue struct {
 	Repo        *RepositoryMeta  `json:"repository"`
 
 	PinOrder int `json:"pin_order"`
+	Weight   int `json:"weight"`
 }
 
 // CreateIssueOption options to create one issue
@@ -98,6 +99,7 @@ type CreateIssueOption struct {
 	// list of label ids
 	Labels []int64 `json:"labels"`
 	Closed bool    `json:"closed"`
+	Weight int     `json:"weight`
 }
 
 // EditIssueOption options for editing an issue
@@ -113,6 +115,7 @@ type EditIssueOption struct {
 	// swagger:strfmt date-time
 	Deadline       *time.Time `json:"due_date"`
 	RemoveDeadline *bool      `json:"unset_due_date"`
+	Weight         *int       `json:"weight"`
 }
 
 // EditDeadlineOption options for creating a deadline

routers/api/v1/repo/issue.go

@@ -707,7 +707,7 @@ func CreateIssue(ctx *context.APIContext) {
 		form.Labels = make([]int64, 0)
 	}
 
-	if err := issue_service.NewIssue(ctx, ctx.Repo.Repository, issue, form.Labels, nil, assigneeIDs, 0, 0); err != nil {
+	if err := issue_service.NewIssue(ctx, ctx.Repo.Repository, issue, form.Labels, nil, assigneeIDs, 0, form.Weight); err != nil {
 		if repo_model.IsErrUserDoesNotHaveAccessToRepo(err) {
 			ctx.Error(http.StatusBadRequest, "UserDoesNotHaveAccessToRepo", err)
 		} else if errors.Is(err, user_model.ErrBlockedUser) {
@@ -829,6 +829,13 @@ func EditIssue(ctx *context.APIContext) {
 		}
 	}
 
+	if form.Weight != nil {
+		if err := issue_service.ChangeIssueWeight(ctx, issue, ctx.Doer, *form.Weight); err != nil {
+			ctx.Error(http.StatusInternalServerError, "ChangeWeight", err)
+			return
+		}
+	}
+
 	// Update or remove the deadline, only if set and allowed
 	if (form.Deadline != nil || form.RemoveDeadline != nil) && canWrite {
 		var deadlineUnix timeutil.TimeStamp

routers/web/repo/issue.go

@@ -266,7 +266,7 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption opt
 	}
 
 	if repo.IsWeightEnabled(ctx) {
-		totalWeight, totalWeightClosed, err := issues_model.GetIssueTotalWeight(ctx, statsOpts, isShowClosed)
+		totalWeight, totalWeightClosed, err := issues_model.GetIssueTotalWeight(ctx, statsOpts)
 		if err != nil {
 			ctx.ServerError("GetIssueTotalWeight", err)
 			return
@@ -2398,7 +2398,6 @@ func UpdateIssueWeight(ctx *context.Context) {
 	}
 
 	ctx.Redirect(issue.Link())
-	// ctx.JSON(http.StatusCreated, api.IssueWeight{Weight: form.Weight})
 }
 
 // UpdateIssueMilestone change issue's milestone

services/convert/issue.go

@@ -55,6 +55,7 @@ func toIssue(ctx context.Context, doer *user_model.User, issue *issues_model.Iss
 		Created:     issue.CreatedUnix.AsTime(),
 		Updated:     issue.UpdatedUnix.AsTime(),
 		PinOrder:    issue.PinOrder,
+		Weight:      issue.Weight,
 	}
 
 	if issue.Repo != nil {

services/issue/issue.go

@@ -126,6 +126,19 @@ func ChangeIssueRef(ctx context.Context, issue *issues_model.Issue, doer *user_m
 	return nil
 }
 
+// ChangeIssueWeight changes the weight of this issue, as the given user.
+func ChangeIssueWeight(ctx context.Context, issue *issues_model.Issue, doer *user_model.User, weight int) error {
+	if issue.Weight == weight {
+		return nil
+	}
+
+	if err := issues_model.UpdateIssueWeight(ctx, issue, weight, doer); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 // UpdateAssignees is a helper function to add or delete one or multiple issue assignee(s)
 // Deleting is done the GitHub way (quote from their api documentation):
 // https://developer.github.com/v3/issues/#edit-an-issue

templates/repo/issue/view_content/comments.tmpl

@@ -2,6 +2,7 @@
 {{range .Issue.Comments}}
 	{{if call $.ShouldShowCommentType .Type}}
 		{{$createdStr:= TimeSinceUnix .CreatedUnix ctx.Locale}}
+        {{$isWeightEnabled:= $.Repository.IsWeightEnabled ctx}}
 
 		<!-- 0 = COMMENT, 1 = REOPEN, 2 = CLOSE, 3 = ISSUE_REF, 4 = COMMIT_REF,
 		5 = COMMENT_REF, 6 = PULL_REF, 7 = COMMENT_LABEL, 8 = MILESTONE_CHANGE,
@@ -700,7 +701,7 @@
 					{{else}}{{ctx.Locale.Tr "repo.issues.unpin_comment" $createdStr}}{{end}}
 				</span>
 			</div>
-        {{else if eq .Type 38}}
+        {{else if and (eq .Type 38) ($isWeightEnabled)}}
 			<div class="timeline-item event" id="{{.HashTag}}">
 				<span class="badge">{{svg "octicon-clock"}}</span>
 				{{template "shared/user/avatarlink" dict "user" .Poster}}
@@ -709,7 +710,7 @@
 					{{ctx.Locale.Tr "repo.issues.weight_added" .Content $createdStr}}
 				</span>
 			</div>
-        {{else if eq .Type 39}}
+        {{else if and (eq .Type 39) ($isWeightEnabled)}}
 			<div class="timeline-item event" id="{{.HashTag}}">
 				<span class="badge">{{svg "octicon-clock"}}</span>
 				{{template "shared/user/avatarlink" dict "user" .Poster}}
@@ -724,7 +725,7 @@
 					{{end}}
 				</span>
 			</div>
-		{{else if eq .Type 40}}
+		{{else if and (eq .Type 40) ($isWeightEnabled)}}
 			<div class="timeline-item event" id="{{.HashTag}}">
 				<span class="badge">{{svg "octicon-clock"}}</span>
 				{{template "shared/user/avatarlink" dict "user" .Poster}}