Commit 78b26c14 authored by Simon Knox's avatar Simon Knox Committed by Jose Ivan Vargas

add approver count badge

parent f3833e13
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
a { .pull-right {
flex: 1; margin-left: auto;
} }
} }
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
Approvers Approvers
.input-group.input-btn-group .input-group.input-btn-group
= users_select_tag("project[approver_ids]", multiple: true, class: 'input-large', scope: :all, email_user: true) = users_select_tag("project[approver_ids]", multiple: true, class: 'input-large', scope: :all, email_user: true)
%button.btn.btn-success{ type: 'submit', title: 'Add approver(s)' } %button.btn.btn-success.js-approvers{ type: 'button', title: 'Add approver(s)' }
Add Add
.help-block .help-block
Add an approver suggestion for each merge request Add an approver suggestion for each merge request
...@@ -75,6 +75,7 @@ ...@@ -75,6 +75,7 @@
.panel.panel-default.prepend-top-10 .panel.panel-default.prepend-top-10
.panel-heading .panel-heading
Approvers Approvers
-# TODO: badge with project.approver_group_ids.count + project.approver_ids.count
%ul.well-list.approver-list %ul.well-list.approver-list
- project.approvers.each do |approver| - project.approvers.each do |approver|
%li.approver.settings-flex-row %li.approver.settings-flex-row
...@@ -84,8 +85,12 @@ ...@@ -84,8 +85,12 @@
= icon("trash") = icon("trash")
- project.approver_groups.each do |approver_group| - project.approver_groups.each do |approver_group|
%li.approver-group.settings-flex-row %li.approver-group.settings-flex-row
.span
%span.light
Group: Group:
= link_to approver_group.group.name, approver_group.group = link_to approver_group.group.name, approver_group.group
%span.badge
= approver_group.group.members.count
.pull-right .pull-right
= link_to namespace_project_approver_group_path(project.namespace, project, approver_group), data: { confirm: "Are you sure you want to remove group #{approver_group.group.name}" }, method: :delete, class: "btn btn-remove", title: 'Remove group' do = link_to namespace_project_approver_group_path(project.namespace, project, approver_group), data: { confirm: "Are you sure you want to remove group #{approver_group.group.name}" }, method: :delete, class: "btn btn-remove", title: 'Remove group' do
= icon("trash") = icon("trash")
......
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