Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
c3293aaf
Commit
c3293aaf
authored
Nov 29, 2016
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implement link-to-member-avatar in approvals ui.
parent
17aba41b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
8 deletions
+15
-8
app/assets/javascripts/merge_request_widget/approvals/components/approvals_footer.js.es6
...quest_widget/approvals/components/approvals_footer.js.es6
+11
-3
app/assets/javascripts/merge_request_widget/stores/widget_store.js.es6
...vascripts/merge_request_widget/stores/widget_store.js.es6
+1
-0
app/views/projects/merge_requests/widget/_open.html.haml
app/views/projects/merge_requests/widget/_open.html.haml
+3
-5
No files found.
app/assets/javascripts/merge_request_widget/approvals/components/approvals_footer.js.es6
View file @
c3293aaf
...
...
@@ -14,7 +14,7 @@
};
gl.MergeRequestWidget.approvalsFooter = {
props: ['approverNames', 'canApprove'],
props: ['approverNames', 'canApprove'
, 'approvedByUsers'
],
methods: {
removeApproval() {
this.$emit('remove-approval');
...
...
@@ -22,17 +22,25 @@
},
components: {
'pending-approver': PendingApprover,
},
methods: {
},
template: `
<div>
Hello Approvals Footer
<div>
<div v-for='approver in approverNames'>
{{ approver }}
<div v-for='approver in approvedByUsers'>
<link-to-member-avatar
:avatar-url='approver.avatar.url'
:display-name='approver.name'
:username='approver.username'>
</link-to-member-avatar>
</div>
<span v-if='canApprove'>
<i class='fa fa-close'></i>
<button @click='removeApproval'>Remove your approval</button>
{{ approvedByUsers[0].name }}
</span>
</div>
</div>
...
...
app/assets/javascripts/merge_request_widget/stores/widget_store.js.es6
View file @
c3293aaf
...
...
@@ -30,6 +30,7 @@
const dataset = this.dataset;
Object.assign( this.data, {
approvals: {
approvedByUsers: JSON.parse(dataset.approvedByUsers),
approverNames: JSON.parse(dataset.approverNames),
approvalsLeft: Number(dataset.approvalsLeft),
moreApprovals: Number(dataset.approvalsLeft),
...
...
app/views/projects/merge_requests/widget/_open.html.haml
View file @
c3293aaf
#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-approve
d-by-users'
=>
@merge_request
.
approved_by_users
.
to_json
,
'data-approve
r-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'
}
=
render
'projects/merge_requests/widget/heading'
.mr-widget-body
...
...
@@ -50,7 +50,5 @@
-
if
@merge_request
.
approvals
.
any?
.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'
}
%span
{
slot:
'links-to-members'
}
-
@merge_request
.
approved_by_users
.
each
do
|
user
|
=
link_to_member
(
@project
,
user
,
name:
false
,
size:
24
)
%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'
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment