Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix milestone appliance and permission checks #4271

Merged
merged 4 commits into from
Jun 19, 2018
Merged

Fix milestone appliance and permission checks #4271

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c528505
Fix milestone appliance
jonasfranz Jun 18, 2018
7dc237c
Fix comment
lafriks Jun 19, 2018
7830c7f
Add Gitea copyright line
lafriks Jun 19, 2018
602cbc1
Merge branch 'master' into fix-create-issue-milestone
lafriks Jun 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix milestone appliance 
Fix missing permission check

Signed-off-by: Jonas Franz <info@jonasfranz.software>
  • Loading branch information
@jonasfranz
jonasfranz committed Jun 18, 2018
commit c528505c6de6bbb96c9cc7856f80fd1a959ef01c
25 changes: 16 additions & 9 deletions routers/api/v1/repo/issue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ func CreateIssue(ctx *context.APIContext, form api.CreateIssueOption) {
// "$ref": "#/responses/Issue"

var deadlineUnix util.TimeStamp
if form.Deadline != nil {
if form.Deadline != nil && ctx.Repo.IsWriter() {
deadlineUnix = util.TimeStamp(form.Deadline.Unix())
}

Expand All @@ -178,15 +178,22 @@ func CreateIssue(ctx *context.APIContext, form api.CreateIssueOption) {
DeadlineUnix: deadlineUnix,
}

// Get all assignee IDs
assigneeIDs, err := models.MakeIDsFromAPIAssigneesToAdd(form.Assignee, form.Assignees)
if err != nil {
if models.IsErrUserNotExist(err) {
ctx.Error(422, "", fmt.Sprintf("Assignee does not exist: [name: %s]", err))
} else {
ctx.Error(500, "AddAssigneeByName", err)
var assigneeIDs = make([]int64, 0)
var err error
if ctx.Repo.IsWriter() {
issue.MilestoneID = form.Milestone
assigneeIDs, err = models.MakeIDsFromAPIAssigneesToAdd(form.Assignee, form.Assignees)
if err != nil {
if models.IsErrUserNotExist(err) {
ctx.Error(422, "", fmt.Sprintf("Assignee does not exist: [name: %s]", err))
} else {
ctx.Error(500, "AddAssigneeByName", err)
}
return
}
return
} else {
// setting labels is only allowed if user is writter
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

comment should be ... is not a writer.

form.Labels = make([]int64, 0)
}

if err := models.NewIssue(ctx.Repo.Repository, issue, form.Labels, assigneeIDs, nil); err != nil {
Expand Down