Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/shared/issuable/_sidebar_todo.html.haml')
-rw-r--r--app/views/shared/issuable/_sidebar_todo.html.haml26
1 files changed, 20 insertions, 6 deletions
diff --git a/app/views/shared/issuable/_sidebar_todo.html.haml b/app/views/shared/issuable/_sidebar_todo.html.haml
index 660ee6d5777..8411327566b 100644
--- a/app/views/shared/issuable/_sidebar_todo.html.haml
+++ b/app/views/shared/issuable/_sidebar_todo.html.haml
@@ -1,14 +1,28 @@
- is_collapsed = local_assigns.fetch(:is_collapsed, false)
-- mark_content = is_collapsed ? sprite_icon('todo-done', css_class: 'todo-undone') : _('Mark todo as done')
-- todo_content = is_collapsed ? sprite_icon('todo-add') : _('Add todo')
+- todo = issuable_sidebar[:todo] || {}
+
+- todo_text = _('Add todo')
+- mark_text = _('Mark todo as done')
+- todo_icon = sprite_icon('todo-add')
+- mark_icon = sprite_icon('todo-done', css_class: 'todo-undone')
+
+- mark_content = is_collapsed ? mark_icon : mark_text
+- todo_content = is_collapsed ? todo_icon : todo_text
%button.issuable-todo-btn.js-issuable-todo{ type: 'button',
class: (is_collapsed ? 'btn-blank sidebar-collapsed-icon dont-change-state has-tooltip' : 'btn btn-default issuable-header-btn float-right'),
- title: (todo.nil? ? _('Add todo') : _('Mark todo as done')),
- 'aria-label' => (todo.nil? ? _('Add todo') : _('Mark todo as done')),
- data: issuable_todo_button_data(issuable, todo, is_collapsed) }
+ title: (todo[:id] ? mark_text : todo_text),
+ 'aria-label' => (todo[:id] ? mark_text : todo_text),
+ data: { todo_text: todo_text,
+ mark_text: mark_text,
+ todo_icon: is_collapsed ? todo_icon : nil,
+ mark_icon: is_collapsed ? mark_icon : nil,
+ issuable_id: issuable_sidebar[:id],
+ issuable_type: issuable_sidebar[:type],
+ create_path: issuable_sidebar[:create_todo_path],
+ delete_path: todo[:delete_path] } }
%span.issuable-todo-inner.js-issuable-todo-inner<
- - if todo
+ - if todo[:id]
= mark_content
- else
= todo_content