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
8ba6244e
Commit
8ba6244e
authored
Dec 14, 2016
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Completely wire up approvals_api.
parent
414f52ec
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
24 deletions
+8
-24
app/assets/javascripts/merge_request_widget/approvals/components/approvals_body.js.es6
...request_widget/approvals/components/approvals_body.js.es6
+1
-9
app/assets/javascripts/merge_request_widget/approvals/components/approvals_footer.js.es6
...quest_widget/approvals/components/approvals_footer.js.es6
+3
-12
app/assets/javascripts/merge_request_widget/approvals/services/approvals_api.js.es6
...ge_request_widget/approvals/services/approvals_api.js.es6
+2
-1
app/assets/javascripts/merge_request_widget/approvals/stores/approvals_store.js.es6
...ge_request_widget/approvals/stores/approvals_store.js.es6
+2
-2
No files found.
app/assets/javascripts/merge_request_widget/approvals/components/approvals_body.js.es6
View file @
8ba6244e
...
...
@@ -5,11 +5,6 @@
Vue.component('approvals-body', {
name: 'approvals-body',
props: ['approvedBy', 'approvalsLeft', 'userCanApprove', 'userHasApproved'],
data() {
return {
loading: true,
};
},
computed: {
approvalsRequiredStringified() {
return this.approvalsLeft === 1 ? 'one more approval' :
...
...
@@ -37,9 +32,7 @@
},
},
beforeCreate() {
gl.ApprovalsStore.fetch().then(() => {
this.loading = false;
});
return gl.ApprovalsStore.fetch().then();
},
template: `
<div>
...
...
@@ -53,7 +46,6 @@
</button>
</div>
</div>
<loading-icon v-if='loading'></loading-icon>
</div>
`,
});
...
...
app/assets/javascripts/merge_request_widget/approvals/components/approvals_footer.js.es6
View file @
8ba6244e
//= require ../stores/approvals_store
//= require vue_common_component/link_to_member_avatar
//= require vue_common_component/loading_icon
(() => {
Vue.component('approvals-footer', {
name: 'approvals-footer',
props: ['userCanApprove', 'userHasApproved', 'approvedBy', 'approvalsLeft', 'pendingAvatarSvg', 'checkmarkSvg'],
data() {
return {
loading: true,
};
},
computed: {
hasApprovers() {
return this.approvedBy && this.approvedBy.length;
...
...
@@ -22,13 +16,11 @@
},
methods: {
removeApproval() {
return
gl.ApprovalsStore.unapprove();
gl.ApprovalsStore.unapprove();
},
},
beforeCreate() {
return gl.ApprovalsStore.fetch().then(() => {
this.loading = false;
});
return gl.ApprovalsStore.fetch();
},
template: `
<div v-if='hasApprovers' class='mr-widget-footer approved-by-users approvals-footer clearfix'>
...
...
@@ -54,9 +46,8 @@
</span>
<span class='unapprove-btn-wrap' v-if='showUnapproveButton'>
<i class='fa fa-close'></i>
<span @click='removeApproval'>Remove your approval</span>
<span @click='removeApproval
()
'>Remove your approval</span>
</span>
<loading-icon v-if='loading'></loading-icon>
</div>
`,
});
...
...
app/assets/javascripts/merge_request_widget/approvals/services/approvals_api.js.es6
View file @
8ba6244e
...
...
@@ -9,6 +9,7 @@
init(mergeRequestEndpoint) {
this.baseEndpoint = mergeRequestEndpoint;
Vue.http.headers.common['X-CSRF-Token'] = $.rails.csrfToken();
}
fetchApprovals() {
...
...
@@ -20,7 +21,7 @@
approveMergeRequest() {
const endpoint = `${this.baseEndpoint}/approvals`;
return Vue.http.
save
(endpoint).catch((err) => {
return Vue.http.
post
(endpoint).catch((err) => {
console.error(`Error approving merge request. ${err}`);
});
}
...
...
app/assets/javascripts/merge_request_widget/approvals/stores/approvals_store.js.es6
View file @
8ba6244e
...
...
@@ -28,12 +28,12 @@
approve() {
return this.api.approveMergeRequest()
.then(res => this.
rootStore.assignToData
(res.data));
.then(res => this.
assignToRootStore
(res.data));
}
unapprove() {
return this.api.unapproveMergeRequest()
.then(res => this.
rootStore.assignToData
(res.data));
.then(res => this.
assignToRootStore
(res.data));
}
}
...
...
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