Commit c3293aaf authored by Bryce Johnson's avatar Bryce Johnson

Implement link-to-member-avatar in approvals ui.

parent 17aba41b
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
}; };
gl.MergeRequestWidget.approvalsFooter = { gl.MergeRequestWidget.approvalsFooter = {
props: ['approverNames', 'canApprove'], props: ['approverNames', 'canApprove', 'approvedByUsers'],
methods: { methods: {
removeApproval() { removeApproval() {
this.$emit('remove-approval'); this.$emit('remove-approval');
...@@ -22,17 +22,25 @@ ...@@ -22,17 +22,25 @@
}, },
components: { components: {
'pending-approver': PendingApprover, 'pending-approver': PendingApprover,
},
methods: {
}, },
template: ` template: `
<div> <div>
Hello Approvals Footer Hello Approvals Footer
<div> <div>
<div v-for='approver in approverNames'> <div v-for='approver in approvedByUsers'>
{{ approver }} <link-to-member-avatar
:avatar-url='approver.avatar.url'
:display-name='approver.name'
:username='approver.username'>
</link-to-member-avatar>
</div> </div>
<span v-if='canApprove'> <span v-if='canApprove'>
<i class='fa fa-close'></i> <i class='fa fa-close'></i>
<button @click='removeApproval'>Remove your approval</button> <button @click='removeApproval'>Remove your approval</button>
{{ approvedByUsers[0].name }}
</span> </span>
</div> </div>
</div> </div>
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
const dataset = this.dataset; const dataset = this.dataset;
Object.assign( this.data, { Object.assign( this.data, {
approvals: { approvals: {
approvedByUsers: JSON.parse(dataset.approvedByUsers),
approverNames: JSON.parse(dataset.approverNames), approverNames: JSON.parse(dataset.approverNames),
approvalsLeft: Number(dataset.approvalsLeft), approvalsLeft: Number(dataset.approvalsLeft),
moreApprovals: Number(dataset.approvalsLeft), moreApprovals: Number(dataset.approvalsLeft),
......
#merge-request-widget-app.mr-state-widget{ 'data-approver-names' => @merge_request.approvers_left.map(&:name),'data-approvals-left' => @merge_request.approvals_left, #merge-request-widget-app.mr-state-widget{ 'data-approved-by-users' => @merge_request.approved_by_users.to_json, 'data-approver-names' => @merge_request.approvers_left.map(&:name),'data-approvals-left' => @merge_request.approvals_left,
'data-more-approvals' => (@merge_request.approvals_left - @merge_request.approvers_left.count),'data-can-edit' => @merge_request.can_approve?(current_user), 'data-endpoint'=> '/myendpoint/tho' } 'data-more-approvals' => (@merge_request.approvals_left - @merge_request.approvers_left.count),'data-can-edit' => @merge_request.can_approve?(current_user), 'data-endpoint'=> '/myendpoint/tho' }
= render 'projects/merge_requests/widget/heading' = render 'projects/merge_requests/widget/heading'
.mr-widget-body .mr-widget-body
...@@ -50,7 +50,5 @@ ...@@ -50,7 +50,5 @@
- if @merge_request.approvals.any? - if @merge_request.approvals.any?
.mr-widget-footer.approved-by-users .mr-widget-footer.approved-by-users
%approvals-footer{ '@remove-approval' => 'unapproveMergeRequest', ':approver-names' => 'approvals.approverNames', ':approvals-left' => 'approvals.approvalsLeft', ':more-approvals' => 'approvals.moreApprovals', ':can-approve' => 'permissions.canEdit' } %approvals-footer{ '@remove-approval' => 'unapproveMergeRequest', ':approved-by-users' => 'approvals.approvedByUsers', ':approver-names' => 'approvals.approverNames', ':approvals-left' => 'approvals.approvalsLeft', ':more-approvals' => 'approvals.moreApprovals', ':can-approve' => 'permissions.canEdit' }
%span{ slot: 'links-to-members'}
- @merge_request.approved_by_users.each do |user|
= link_to_member(@project, user, name: false, size: 24)
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