diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-09-06 15:49:49 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-09-08 11:52:20 +0300 |
| commit | f28ca293b78405d798f1df78a39d549157a57c07 (patch) | |
| tree | 55c42f3fdbb2b0e2c24baac69e46b9c3cd517f6b /app/views/projects/issues | |
| parent | 43d6328fbc40e95999fcbb2cdbd5932d7dc799ad (diff) | |
| download | gitlab-ce-f28ca293b78405d798f1df78a39d549157a57c07.tar.gz | |
Add bulk update support for merge requests list
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
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 | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/app/views/projects/issues/_issue.html.haml b/app/views/projects/issues/_issue.html.haml index 79b14819865..851d4c06990 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 } } - - if controller.controller_name == 'issues' && can?(current_user, :admin_issue, @project) + - if @bulk_edit .issue-check - = check_box_tag dom_id(issue,"selected"), nil, false, 'data-id' => issue.id, class: "selected_issue" + = check_box_tag dom_id(issue, "selected"), nil, false, 'data-id' => issue.id, class: "selected_issue" .issue-title.title %span.issue-title-text diff --git a/app/views/projects/issues/index.html.haml b/app/views/projects/issues/index.html.haml index 1a87045aa60..023ea5f17d7 100644 --- a/app/views/projects/issues/index.html.haml +++ b/app/views/projects/issues/index.html.haml @@ -1,4 +1,6 @@ - @no_container = true +- @bulk_edit = can?(current_user, :admin_issue, @project) + - page_title "Issues" - new_issue_email = @project.new_issue_address(current_user) = render "projects/issues/head" @@ -29,7 +31,7 @@ New Issue = render 'shared/issuable/filter', type: :issues - .issues-holder + .issues-holder.issuable-list = render 'issues' - if new_issue_email = render 'issue_by_email', email: new_issue_email |