Skip to content
Snippets Groups Projects
Commit b16780f7 authored by Phil Hughes's avatar Phil Hughes
Browse files

Fixed issue boards when not logged in

parent 763a89a3
No related branches found
No related tags found
1 merge request!7452Fixed issue boards when not logged in
Pipeline #
Loading
@@ -266,7 +266,7 @@ class Issue < ActiveRecord::Base
Loading
@@ -266,7 +266,7 @@ class Issue < ActiveRecord::Base
   
def as_json(options = {}) def as_json(options = {})
super(options).tap do |json| super(options).tap do |json|
json[:subscribed] = subscribed?(options[:user]) if options.has_key?(:user) json[:subscribed] = subscribed?(options[:user]) if options.has_key?(:user) && options[:user]
   
if options.has_key?(:labels) if options.has_key?(:labels)
json[:labels] = labels.as_json( json[:labels] = labels.as_json(
Loading
Loading
%board-sidebar{ "inline-template" => true, %board-sidebar{ "inline-template" => true,
":current-user" => "#{current_user.to_json(only: [:username, :id, :name], methods: [:avatar_url]) if current_user}" } ":current-user" => "#{current_user ? current_user.to_json(only: [:username, :id, :name], methods: [:avatar_url]) : {}}" }
%aside.right-sidebar.right-sidebar-expanded.issue-boards-sidebar{ "v-show" => "showSidebar" } %aside.right-sidebar.right-sidebar-expanded.issue-boards-sidebar{ "v-show" => "showSidebar" }
.issuable-sidebar .issuable-sidebar
.block.issuable-sidebar-header .block.issuable-sidebar-header
Loading
Loading
.block.assignee .block.assignee
.title.hide-collapsed .title.hide-collapsed
Assignee Assignee
= icon("spinner spin", class: "block-loading")
- if can?(current_user, :admin_issue, @project) - if can?(current_user, :admin_issue, @project)
= icon("spinner spin", class: "block-loading")
= link_to "Edit", "#", class: "edit-link pull-right" = link_to "Edit", "#", class: "edit-link pull-right"
.value.hide-collapsed .value.hide-collapsed
%span.assign-yourself.no-value{ "v-if" => "!issue.assignee" } %span.assign-yourself.no-value{ "v-if" => "!issue.assignee" }
Loading
Loading
.block.due_date .block.due_date
.title .title
Due date Due date
= icon("spinner spin", class: "block-loading")
- if can?(current_user, :admin_issue, @project) - if can?(current_user, :admin_issue, @project)
= icon("spinner spin", class: "block-loading")
= link_to "Edit", "#", class: "edit-link pull-right" = link_to "Edit", "#", class: "edit-link pull-right"
.value .value
.value-content .value-content
Loading
Loading
.block.labels .block.labels
.title .title
Labels Labels
= icon("spinner spin", class: "block-loading")
- if can?(current_user, :admin_issue, @project) - if can?(current_user, :admin_issue, @project)
= icon("spinner spin", class: "block-loading")
= link_to "Edit", "#", class: "edit-link pull-right" = link_to "Edit", "#", class: "edit-link pull-right"
.value.issuable-show-labels .value.issuable-show-labels
%span.no-value{ "v-if" => "issue.labels && issue.labels.length === 0" } %span.no-value{ "v-if" => "issue.labels && issue.labels.length === 0" }
Loading
Loading
.block.milestone .block.milestone
.title .title
Milestone Milestone
= icon("spinner spin", class: "block-loading")
- if can?(current_user, :admin_issue, @project) - if can?(current_user, :admin_issue, @project)
= icon("spinner spin", class: "block-loading")
= link_to "Edit", "#", class: "edit-link pull-right" = link_to "Edit", "#", class: "edit-link pull-right"
.value .value
%span.no-value{ "v-if" => "!issue.milestone" } %span.no-value{ "v-if" => "!issue.milestone" }
Loading
Loading
Loading
@@ -659,6 +659,10 @@ describe 'Issue Boards', feature: true, js: true do
Loading
@@ -659,6 +659,10 @@ describe 'Issue Boards', feature: true, js: true do
wait_for_vue_resource wait_for_vue_resource
end end
   
it 'displays lists' do
expect(page).to have_selector('.board')
end
it 'does not show create new list' do it 'does not show create new list' do
expect(page).not_to have_selector('.js-new-board-list') expect(page).not_to have_selector('.js-new-board-list')
end end
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment