Commit ab95f82d authored by Tim Zallmann's avatar Tim Zallmann

Merge branch 'guest-focus-mode' into 'master'

Fixed issue boards focus mode not being visible to guest users

Closes #3182

See merge request !2699
parents 8d3330ec b51b1062
...@@ -140,11 +140,18 @@ $(() => { ...@@ -140,11 +140,18 @@ $(() => {
gl.IssueBoardsModalAddBtn = new Vue({ gl.IssueBoardsModalAddBtn = new Vue({
mixins: [gl.issueBoards.ModalMixins], mixins: [gl.issueBoards.ModalMixins],
el: document.getElementById('js-add-issues-btn'), el: document.getElementById('js-add-issues-btn'),
data: { data() {
modal: ModalStore.store, return {
store: Store.state, modal: ModalStore.store,
isFullscreen: false, store: Store.state,
focusModeAvailable: gl.utils.convertPermissionToBoolean($boardApp.dataset.focusModeAvailable), isFullscreen: false,
focusModeAvailable: gl.utils.convertPermissionToBoolean(
$boardApp.dataset.focusModeAvailable,
),
canAdminList: gl.utils.convertPermissionToBoolean(
this.$options.el.dataset.canAdminList,
),
};
}, },
watch: { watch: {
disabled() { disabled() {
...@@ -202,12 +209,13 @@ $(() => { ...@@ -202,12 +209,13 @@ $(() => {
:class="{ 'disabled': disabled }" :class="{ 'disabled': disabled }"
:title="tooltipTitle" :title="tooltipTitle"
:aria-disabled="disabled" :aria-disabled="disabled"
v-if="canAdminList"
@click="openModal"> @click="openModal">
Add issues Add issues
</button> </button>
<a <a
href="#" href="#"
class="btn btn-default has-tooltip prepend-left-10" class="btn btn-default has-tooltip prepend-left-10 js-focus-mode-btn"
role="button" role="button"
aria-label="Toggle focus mode" aria-label="Toggle focus mode"
title="Toggle focus mode" title="Toggle focus mode"
......
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
top: 0; top: 0;
left: 0; left: 0;
background: $white-light; background: $white-light;
z-index: 500; z-index: 9000;
.boards-list { .boards-list {
height: calc(100vh - 50px); height: calc(100vh - 50px);
......
...@@ -126,6 +126,6 @@ ...@@ -126,6 +126,6 @@
- if can?(current_user, :admin_label, @project) - if can?(current_user, :admin_label, @project)
= render partial: "shared/issuable/label_page_create" = render partial: "shared/issuable/label_page_create"
= dropdown_loading = dropdown_loading
#js-add-issues-btn.prepend-left-10 #js-add-issues-btn.prepend-left-10{ data: { can_admin_list: can?(current_user, :admin_list, @project).to_s } }
- elsif type != :boards_modal - elsif type != :boards_modal
= render 'shared/sort_dropdown' = render 'shared/sort_dropdown'
---
title: Fix issue boards focus button not being visible to guest users
merge_request:
author:
type: fixed
require 'rails_helper'
describe 'Issue Boards focus mode', :js do
let(:project) { create(:project, :public) }
before do
visit project_boards_path(project)
wait_for_requests
end
it "shows focus mode button to guest users" do
expect(page).to have_selector('.board-extra-actions .js-focus-mode-btn')
end
end
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