Commit e2e72fe5 authored by Oswaldo Ferreira's avatar Oswaldo Ferreira

Adjust board lists header text color

Adjusts regression fixed by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18786/. We were not returning the label text color correctly on the backend.
parent efd7b57b
...@@ -31,7 +31,8 @@ class List < ActiveRecord::Base ...@@ -31,7 +31,8 @@ class List < ActiveRecord::Base
if options.key?(:label) if options.key?(:label)
json[:label] = label.as_json( json[:label] = label.as_json(
project: board.project, project: board.project,
only: [:id, :title, :description, :color] only: [:id, :title, :description, :color],
methods: [:text_color]
) )
end end
end end
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
":title" => '(list.label ? list.label.description : "")', ":title" => '(list.label ? list.label.description : "")',
data: { container: "body", placement: "bottom" }, data: { container: "body", placement: "bottom" },
class: "label color-label title board-title-text", class: "label color-label title board-title-text",
":style" => "{ backgroundColor: (list.label && list.label.color ? list.label.color : null), color: (list.label && list.label.text_color ? list.label.text_color : \"#2e2e2e\") }" } ":style" => "{ backgroundColor: (list.label && list.label.color ? list.label.color : null), color: (list.label && list.label.textColor ? list.label.textColor : \"#2e2e2e\") }" }
{{ list.title }} {{ list.title }}
- if can?(current_user, :admin_list, current_board_parent) - if can?(current_user, :admin_list, current_board_parent)
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
"required": [ "required": [
"id", "id",
"color", "color",
"text_color",
"description", "description",
"title", "title",
"priority" "priority"
...@@ -29,6 +30,7 @@ ...@@ -29,6 +30,7 @@
}, },
"description": { "type": ["string", "null"] }, "description": { "type": ["string", "null"] },
"title": { "type": "string" }, "title": { "type": "string" },
"title": { "text_color": "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