Fixed bug with sidebar when user is not logged in
This commit is contained in:
parent
a1be3241ec
commit
04c199a0ab
2 changed files with 15 additions and 11 deletions
|
@ -78,7 +78,9 @@ module IssuablesHelper
|
|||
end
|
||||
|
||||
def has_todo(issuable)
|
||||
current_user.todos.find_by(target_id: issuable.id, state: :pending)
|
||||
unless current_user.nil?
|
||||
current_user.todos.find_by(target_id: issuable.id, state: :pending)
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
|
|
|
@ -3,18 +3,20 @@
|
|||
.issuable-sidebar
|
||||
- can_edit_issuable = can?(current_user, :"admin_#{issuable.to_ability_name}", @project)
|
||||
.block.issuable-sidebar-header
|
||||
%span.issuable-header-text.hide-collapsed.pull-left
|
||||
Todo
|
||||
- if current_user
|
||||
%span.issuable-header-text.hide-collapsed.pull-left
|
||||
Todo
|
||||
%a.gutter-toggle.pull-right.js-sidebar-toggle{ role: "button", href: "#", aria: { label: "Toggle sidebar" } }
|
||||
= sidebar_gutter_toggle_icon
|
||||
%button.btn.btn-default.issuable-header-btn.pull-right.js-issuable-todo{ type: "button", data: { todo_text: "Add Todo", mark_text: "Mark Done", id: (todo.id unless todo.nil?), url: issuable_todo_path(issuable) } }
|
||||
- if todo.nil?
|
||||
%span
|
||||
Add Todo
|
||||
- else
|
||||
%span
|
||||
Mark Done
|
||||
= icon('spin spinner', class: 'hidden js-issuable-todo-loading')
|
||||
- if current_user
|
||||
%button.btn.btn-default.issuable-header-btn.pull-right.js-issuable-todo{ type: "button", data: { todo_text: "Add Todo", mark_text: "Mark Done", id: (todo.id unless todo.nil?), url: issuable_todo_path(issuable) } }
|
||||
- if todo.nil?
|
||||
%span
|
||||
Add Todo
|
||||
- else
|
||||
%span
|
||||
Mark Done
|
||||
= icon('spin spinner', class: 'hidden js-issuable-todo-loading')
|
||||
|
||||
= form_for [@project.namespace.becomes(Namespace), @project, issuable], remote: true, format: :json, html: {class: 'issuable-context-form inline-update js-issuable-update'} do |f|
|
||||
.block.assignee
|
||||
|
|
Loading…
Reference in a new issue