Commit 5074a68e authored by Felipe Artur's avatar Felipe Artur

Fix license checks and list service for project boards

parent 09073716
......@@ -58,6 +58,7 @@ module BoardsHelper
{
toggle: "dropdown",
list_labels_path: labels_filter_path(true),
labels: labels_filter_path(true),
labels_endpoint: @labels_endpoint,
namespace_path: @namespace_path,
project_path: @project&.try(:path)
......
......@@ -41,7 +41,7 @@ module Boards
end
def set_parent
params[:project_id] = project.id
params[:project_id] = parent.id
end
def set_state
......
......@@ -8,6 +8,7 @@
%span
List
- if @group.feature_available?(:group_issue_boards)
= nav_link(path: 'groups#boards') do
= link_to group_boards_path(@group), title: 'Boards' do
%span
......
......@@ -119,11 +119,9 @@
- if type == :boards
- if can?(current_user, :admin_list, board.parent)
.dropdown.prepend-left-10#js-add-list
<<<<<<< HEAD
%button.btn.btn-create.btn-inverted.js-new-board-list{ type: "button", data: board_list_data }
=======
%button.btn.btn-create.btn-inverted.js-new-board-list{ type: "button", data: { toggle: "dropdown", labels: labels_filter_path, namespace_path: @project.try(:namespace).try(:full_path), project_path: @project.try(:path) } }
>>>>>>> master
Add list
.dropdown-menu.dropdown-menu-paging.dropdown-menu-align-right.dropdown-menu-issues-board-new.dropdown-menu-selectable
= render partial: "shared/issuable/label_page_default", locals: { show_footer: true, show_create: true, show_boards_content: true, title: "Add list" }
......
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