@@ -189,5 +189,35 @@
{{.Poster.Name}} {{$.i18n.Tr "repo.issues.cancel_tracking_history" $createdStr | Safe}}
+ {{else if eq .Type 16}}
+
+
+
+ 
+
+ {{.Poster.Name}}
+ {{$.i18n.Tr "repo.issues.due_date_added" .Content $createdStr | Safe}}
+
+
+ {{else if eq .Type 17}}
+
+
+
+
+
+ {{.Poster.Name}}
+ {{$.i18n.Tr "repo.issues.due_date_modified" (.Content | ParseDeadline) $createdStr | Safe}}
+
+
+ {{else if eq .Type 18}}
+
+
+
+
+
+ {{.Poster.Name}}
+ {{$.i18n.Tr "repo.issues.due_date_remove" .Content $createdStr | Safe}}
+
+
{{end}}
{{end}}
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl
index dc16ba7499..648533fca1 100644
--- a/templates/repo/issue/view_content/sidebar.tmpl
+++ b/templates/repo/issue/view_content/sidebar.tmpl
@@ -191,5 +191,41 @@
{{end}}
{{end}}
+
+
+ {{.i18n.Tr "repo.issues.due_date"}}
+ {{if gt .Issue.DeadlineUnix 0}}
+
+
+ {{.Issue.DeadlineUnix.FormatShort}}
+ {{if .Issue.IsOverdue}}
+ {{.i18n.Tr "repo.issues.due_date_overdue"}}
+ {{end}}
+ {{if and .IsSigned .IsRepositoryWriter}}
+
+ Edit -
+ Remove
+ {{end}}
+
{{.i18n.Tr "repo.issues.due_date_not_set"}}
+ {{end}} + + {{if and .IsSigned .IsRepositoryWriter}} + + {{end}} + diff --git a/vendor/code.gitea.io/sdk/gitea/attachment.go b/vendor/code.gitea.io/sdk/gitea/attachment.go index e90a7114d9..8c527de735 100644 --- a/vendor/code.gitea.io/sdk/gitea/attachment.go +++ b/vendor/code.gitea.io/sdk/gitea/attachment.go @@ -35,7 +35,7 @@ func (c *Client) ListReleaseAttachments(user, repo string, release int64) ([]*At return attachments, err } -// ListReleaseAttachments list release's attachments +// GetReleaseAttachment returns the requested attachment func (c *Client) GetReleaseAttachment(user, repo string, release int64, id int64) (*Attachment, error) { a := new(Attachment) err := c.getParsedResponse("GET", diff --git a/vendor/code.gitea.io/sdk/gitea/issue.go b/vendor/code.gitea.io/sdk/gitea/issue.go index 206c52a59e..27809ca3b4 100644 --- a/vendor/code.gitea.io/sdk/gitea/issue.go +++ b/vendor/code.gitea.io/sdk/gitea/issue.go @@ -39,6 +39,7 @@ type Issue struct { Labels []*Label `json:"labels"` Milestone *Milestone `json:"milestone"` Assignee *User `json:"assignee"` + Assignees []*User `json:"assignees"` // Whether the issue is open or closed // // type: string @@ -49,6 +50,10 @@ type Issue struct { Created time.Time `json:"created_at"` // swagger:strfmt date-time Updated time.Time `json:"updated_at"` + // swagger:strfmt date-time + Closed *time.Time `json:"closed_at"` + // swagger:strfmt date-time + Deadline *time.Time `json:"due_date"` PullRequest *PullRequestMeta `json:"pull_request"` } @@ -89,7 +94,10 @@ type CreateIssueOption struct { Title string `json:"title" binding:"Required"` Body string `json:"body"` // username of assignee - Assignee string `json:"assignee"` + Assignee string `json:"assignee"` + Assignees []string `json:"assignees"` + // swagger:strfmt date-time + Deadline *time.Time `json:"due_date"` // milestone id Milestone int64 `json:"milestone"` // list of label ids @@ -110,11 +118,14 @@ func (c *Client) CreateIssue(owner, repo string, opt CreateIssueOption) (*Issue, // EditIssueOption options for editing an issue type EditIssueOption struct { - Title string `json:"title"` - Body *string `json:"body"` - Assignee *string `json:"assignee"` - Milestone *int64 `json:"milestone"` - State *string `json:"state"` + Title string `json:"title"` + Body *string `json:"body"` + Assignee *string `json:"assignee"` + Assignees []string `json:"assignees"` + Milestone *int64 `json:"milestone"` + State *string `json:"state"` + // swagger:strfmt date-time + Deadline *time.Time `json:"due_date"` } // EditIssue modify an existing issue for a given repository diff --git a/vendor/code.gitea.io/sdk/gitea/pull.go b/vendor/code.gitea.io/sdk/gitea/pull.go index ee3fe116de..7d38b14d7d 100644 --- a/vendor/code.gitea.io/sdk/gitea/pull.go +++ b/vendor/code.gitea.io/sdk/gitea/pull.go @@ -22,6 +22,7 @@ type PullRequest struct { Labels []*Label `json:"labels"` Milestone *Milestone `json:"milestone"` Assignee *User `json:"assignee"` + Assignees []*User `json:"assignees"` State StateType `json:"state"` Comments int `json:"comments"` @@ -40,10 +41,15 @@ type PullRequest struct { Head *PRBranchInfo `json:"head"` MergeBase string `json:"merge_base"` + // swagger:strfmt date-time + Deadline *time.Time `json:"due_date"` + // swagger:strfmt date-time Created *time.Time `json:"created_at"` // swagger:strfmt date-time Updated *time.Time `json:"updated_at"` + // swagger:strfmt date-time + Closed *time.Time `json:"closed_at"` } // PRBranchInfo information about a branch @@ -79,13 +85,16 @@ func (c *Client) GetPullRequest(owner, repo string, index int64) (*PullRequest, // CreatePullRequestOption options when creating a pull request type CreatePullRequestOption struct { - Head string `json:"head" binding:"Required"` - Base string `json:"base" binding:"Required"` - Title string `json:"title" binding:"Required"` - Body string `json:"body"` - Assignee string `json:"assignee"` - Milestone int64 `json:"milestone"` - Labels []int64 `json:"labels"` + Head string `json:"head" binding:"Required"` + Base string `json:"base" binding:"Required"` + Title string `json:"title" binding:"Required"` + Body string `json:"body"` + Assignee string `json:"assignee"` + Assignees []string `json:"assignees"` + Milestone int64 `json:"milestone"` + Labels []int64 `json:"labels"` + // swagger:strfmt date-time + Deadline *time.Time `json:"due_date"` } // CreatePullRequest create pull request with options @@ -101,12 +110,15 @@ func (c *Client) CreatePullRequest(owner, repo string, opt CreatePullRequestOpti // EditPullRequestOption options when modify pull request type EditPullRequestOption struct { - Title string `json:"title"` - Body string `json:"body"` - Assignee string `json:"assignee"` - Milestone int64 `json:"milestone"` - Labels []int64 `json:"labels"` - State *string `json:"state"` + Title string `json:"title"` + Body string `json:"body"` + Assignee string `json:"assignee"` + Assignees []string `json:"assignees"` + Milestone int64 `json:"milestone"` + Labels []int64 `json:"labels"` + State *string `json:"state"` + // swagger:strfmt date-time + Deadline *time.Time `json:"due_date"` } // EditPullRequest modify pull request with PR id and options diff --git a/vendor/vendor.json b/vendor/vendor.json index 2b5a158bf8..5b5b640f47 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -9,10 +9,10 @@ "revisionTime": "2018-04-21T01:08:19Z" }, { - "checksumSHA1": "PWaIU7g1YSkETxka2DIS1EYsPK0=", + "checksumSHA1": "xXzi8Xx7HA3M0z3lR/1wr1Vz1fc=", "path": "code.gitea.io/sdk/gitea", - "revision": "cdbef997666132599cc92dc22aa94de3db04adeb", - "revisionTime": "2018-03-02T14:48:43Z" + "revision": "142acef5ce79f78585afcce31748af46c72a3dea", + "revisionTime": "2018-04-17T00:54:29Z" }, { "checksumSHA1": "bOODD4Gbw3GfcuQPU2dI40crxxk=",