deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

API attributes refactored

Browse source
This commit is contained in:
Alex Denisov 2012-09-16 19:51:04 +03:00
parent caef9ed112
commit 549c4c2202
4 changed files with 36 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

24
lib/api/issues.rb
View file

@ -48,15 +48,10 @@ module Gitlab
# Example Request:
# POST /projects/:id/issues
post ":id/issues" do
@issue = user_project.issues.new(
title: params[:title],
description: params[:description],
assignee_id: params[:assignee_id],
milestone_id: params[:milestone_id],
label_list: params[:labels]
)
attrs = existed_attributes [:title, :description, :assignee_id, :milestone_id]
attrs[:label_list] = params[:labels] if params[:labels].present?
@issue = user_project.issues.new attrs
@issue.author = current_user
if @issue.save
present @issue, with: Entities::Issue
else
@ -81,16 +76,9 @@ module Gitlab
@issue = user_project.issues.find(params[:issue_id])
authorize! :modify_issue, @issue
parameters = {
title: (params[:title] || @issue.title),
description: (params[:description] || @issue.description),
assignee_id: (params[:assignee_id] || @issue.assignee_id),
milestone_id: (params[:milestone_id] || @issue.milestone_id),
label_list: (params[:labels] || @issue.label_list),
closed: (params[:closed] || @issue.closed)
}
if @issue.update_attributes(parameters)
attrs = existed_attributes [:title, :description, :assignee_id, :milestone_id, :closed]
attrs[:label_list] = params[:labels] if params[:labels].present?
if @issue.update_attributes attrs
present @issue, with: Entities::Issue
else
not_found!