diff options
| author | Bryce Johnson <bryce@gitlab.com> | 2017-05-16 01:12:43 +0300 |
|---|---|---|
| committer | Bryce Johnson <bryce@gitlab.com> | 2017-06-06 16:16:27 +0300 |
| commit | c9a67266d2a79bd55f944516716a59300c1844f6 (patch) | |
| tree | 73dd4086376d3674faf9484ff28c6d7edfe9765b /app/views/projects/issues | |
| parent | 34f925fe0bebdc7212c1c960678114a4e44828ef (diff) | |
Move issuable bulk edit form into a new sidebar.
Diffstat (limited to 'app/views/projects/issues')
| -rw-r--r-- | app/views/projects/issues/_issue.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/issues/index.html.haml | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/app/views/projects/issues/_issue.html.haml b/app/views/projects/issues/_issue.html.haml index c184e0e0022..9e4e6934ca9 100644 --- a/app/views/projects/issues/_issue.html.haml +++ b/app/views/projects/issues/_issue.html.haml @@ -1,7 +1,7 @@ %li{ id: dom_id(issue), class: issue_css_classes(issue), url: issue_path(issue), data: { labels: issue.label_ids, id: issue.id } } .issue-box - - if @bulk_edit - .issue-check + - if @can_bulk_update + .issue-check.hidden = check_box_tag dom_id(issue, "selected"), nil, false, 'data-id' => issue.id, class: "selected_issue" .issue-info-container .issue-title.title diff --git a/app/views/projects/issues/index.html.haml b/app/views/projects/issues/index.html.haml index 60900e9d660..7183794ce72 100644 --- a/app/views/projects/issues/index.html.haml +++ b/app/views/projects/issues/index.html.haml @@ -1,5 +1,5 @@ - @no_container = true -- @bulk_edit = can?(current_user, :admin_issue, @project) +- @can_bulk_update = can?(current_user, :admin_issue, @project) - page_title "Issues" - new_issue_email = @project.new_issue_address(current_user) @@ -20,6 +20,8 @@ .nav-controls = link_to params.merge(rss_url_options), class: 'btn append-right-10 has-tooltip', title: 'Subscribe' do = icon('rss') + - if @can_bulk_update + = button_tag "Edit Issues", class: "btn btn-default js-bulk-update-toggle" = link_to new_namespace_project_issue_path(@project.namespace, @project, issue: { assignee_id: issues_finder.assignee.try(:id), @@ -30,6 +32,9 @@ New issue = render 'shared/issuable/search_bar', type: :issues + - if @can_bulk_update + = render 'shared/issuable/bulk_update_sidebar', type: :issues + .issues-holder = render 'issues' - if new_issue_email |