diff options
| author | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-08-05 16:56:03 +0800 |
|---|---|---|
| committer | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-08-12 13:42:20 +0800 |
| commit | 45064348619ce7585d15756950eae5f5346ee631 (patch) | |
| tree | ad8bc69450e4d4f36a5f91fd35f96e8969091141 /app | |
| parent | d70529df4dcc6c32c98e3e8febf9bd654789d8d2 (diff) | |
| download | gitlab-ce-45064348619ce7585d15756950eae5f5346ee631.tar.gz | |
Fix conflict warning being incorrectly displayed44036-someone-edited-the-issue-at-the-same-time-is-regularly-seen-despite-that-being-a-filthy-lie
Hide warning when update request is in progress
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/issue_show/components/form.vue | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/issue_show/components/form.vue b/app/assets/javascripts/issue_show/components/form.vue index 528ccb77efc..d48bf1fe7a9 100644 --- a/app/assets/javascripts/issue_show/components/form.vue +++ b/app/assets/javascripts/issue_show/components/form.vue @@ -70,6 +70,9 @@ export default { hasIssuableTemplates() { return this.issuableTemplates.length; }, + showLockedWarning() { + return this.formState.lockedWarningVisible && !this.formState.updateLoading; + }, }, created() { eventHub.$on('delete.issuable', this.resetAutosave); @@ -117,7 +120,7 @@ export default { <template> <form> - <locked-warning v-if="formState.lockedWarningVisible" /> + <locked-warning v-if="showLockedWarning" /> <div class="row"> <div v-if="hasIssuableTemplates" class="col-sm-4 col-lg-3"> <description-template |