diff options
| author | Brett Walker <bwalker@gitlab.com> | 2019-01-10 15:22:28 -0600 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2019-01-30 23:18:13 +0100 |
| commit | 83306d249e0762d21b9ca128b9ebb57a0bef6f8b (patch) | |
| tree | b2cd7dc17355ce61ac8eff4ae4f7abe0797ac7d7 /app/assets/javascripts/task_list.js | |
| parent | f1acd5051513ee815578f7311ca88ee54e79e323 (diff) | |
| download | gitlab-ce-83306d249e0762d21b9ca128b9ebb57a0bef6f8b.tar.gz | |
Pass tasklist lock version
receive data on when there is a conflict
Diffstat (limited to 'app/assets/javascripts/task_list.js')
| -rw-r--r-- | app/assets/javascripts/task_list.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/task_list.js b/app/assets/javascripts/task_list.js index edefb3735d7..f063250c36f 100644 --- a/app/assets/javascripts/task_list.js +++ b/app/assets/javascripts/task_list.js @@ -8,8 +8,9 @@ export default class TaskList { this.selector = options.selector; this.dataType = options.dataType; this.fieldName = options.fieldName; + this.lockVersion = options.lockVersion; this.onSuccess = options.onSuccess || (() => {}); - this.onError = function showFlash(e) { + this.onError = options.onError || function showFlash(e) { let errorMessages = ''; if (e.response.data && typeof e.response.data === 'object') { @@ -43,6 +44,7 @@ export default class TaskList { const patchData = {}; patchData[this.dataType] = { [this.fieldName]: $target.val(), + ['lock_version']: this.lockVersion, }; return axios |