Returns label description in JSON when listing lists/issues

parent 215bfd1c
...@@ -14,7 +14,7 @@ class Projects::BoardIssuesController < Projects::ApplicationController ...@@ -14,7 +14,7 @@ class Projects::BoardIssuesController < Projects::ApplicationController
only: [:iid, :title, :confidential], only: [:iid, :title, :confidential],
include: { include: {
assignee: { only: [:id, :name, :username], methods: [:avatar_url] }, assignee: { only: [:id, :name, :username], methods: [:avatar_url] },
labels: { only: [:id, :title, :color, :priority] } labels: { only: [:id, :title, :description, :color, :priority] }
}) })
end end
......
...@@ -9,7 +9,7 @@ class Projects::BoardListsController < Projects::ApplicationController ...@@ -9,7 +9,7 @@ class Projects::BoardListsController < Projects::ApplicationController
list = Boards::Lists::CreateService.new(project, current_user, list_params).execute list = Boards::Lists::CreateService.new(project, current_user, list_params).execute
if list.valid? if list.valid?
render json: list.as_json(only: [:id, :list_type, :position], methods: [:title], include: { label: { only: [:id, :title, :color, :priority] } }) render json: list.as_json(only: [:id, :list_type, :position], methods: [:title], include: { label: { only: [:id, :title, :description, :color, :priority] } })
else else
render json: list.errors, status: :unprocessable_entity render json: list.errors, status: :unprocessable_entity
end end
...@@ -39,7 +39,7 @@ class Projects::BoardListsController < Projects::ApplicationController ...@@ -39,7 +39,7 @@ class Projects::BoardListsController < Projects::ApplicationController
service = Boards::Lists::GenerateService.new(project, current_user) service = Boards::Lists::GenerateService.new(project, current_user)
if service.execute if service.execute
render json: project.board.lists.label.as_json(only: [:id, :list_type, :position], methods: [:title], include: { label: { only: [:id, :title, :color, :priority] } }) render json: project.board.lists.label.as_json(only: [:id, :list_type, :position], methods: [:title], include: { label: { only: [:id, :title, :description, :color, :priority] } })
else else
head :unprocessable_entity head :unprocessable_entity
end end
......
...@@ -6,7 +6,7 @@ class Projects::BoardsController < Projects::ApplicationController ...@@ -6,7 +6,7 @@ class Projects::BoardsController < Projects::ApplicationController
respond_to do |format| respond_to do |format|
format.html format.html
format.json { render json: board.lists.as_json(only: [:id, :list_type, :position], methods: [:title], include: { label: { only: [:id, :title, :color, :priority] } }) } format.json { render json: board.lists.as_json(only: [:id, :list_type, :position], methods: [:title], include: { label: { only: [:id, :title, :description, :color, :priority] } }) }
end end
end end
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
"required": [ "required": [
"id", "id",
"color", "color",
"description",
"title", "title",
"priority" "priority"
], ],
...@@ -23,6 +24,7 @@ ...@@ -23,6 +24,7 @@
"type": "string", "type": "string",
"pattern": "^#[0-9A-Fa-f]{3}{1,2}+$" "pattern": "^#[0-9A-Fa-f]{3}{1,2}+$"
}, },
"description": { "type": ["string", "null"] },
"title": { "type": "string" }, "title": { "type": "string" },
"priority": { "type": ["integer", "null"] } "priority": { "type": ["integer", "null"] }
} }
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
"required": [ "required": [
"id", "id",
"color", "color",
"description",
"title", "title",
"priority" "priority"
], ],
...@@ -26,6 +27,7 @@ ...@@ -26,6 +27,7 @@
"type": "string", "type": "string",
"pattern": "^#[0-9A-Fa-f]{3}{1,2}+$" "pattern": "^#[0-9A-Fa-f]{3}{1,2}+$"
}, },
"description": { "type": ["string", "null"] },
"title": { "type": "string" }, "title": { "type": "string" },
"priority": { "type": ["integer", "null"] } "priority": { "type": ["integer", "null"] }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment