diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-10-28 17:55:18 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-10-28 17:55:18 +0000 |
| commit | f4fed44f6700aed93015dfeac0ade00a93e8288d (patch) | |
| tree | aee92baf368c306e9423acb8e486ce5a30e0594b /app/assets | |
| parent | f60e6d552c47e3119c57ac77838d0666da38c571 (diff) | |
| parent | 32913b74b836c7b689e681a030de00da0552954a (diff) | |
| download | gitlab-ce-f4fed44f6700aed93015dfeac0ade00a93e8288d.tar.gz | |
Merge branch '22392-add-x-of-y-tasks-completed-on-issuable' into 'master'
add "x of y tasks completed" on issuable
Closes #22392
See merge request !6527
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/issue.js | 6 | ||||
| -rw-r--r-- | app/assets/javascripts/merge_request.js | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/app/assets/javascripts/issue.js b/app/assets/javascripts/issue.js index e83dae2bb3c..67ace697936 100644 --- a/app/assets/javascripts/issue.js +++ b/app/assets/javascripts/issue.js @@ -95,7 +95,11 @@ return $.ajax({ type: 'PATCH', url: $('form.js-issuable-update').attr('action'), - data: patchData + data: patchData, + success: function(issue) { + document.querySelector('#task_status').innerText = issue.task_status; + document.querySelector('#task_status_short').innerText = issue.task_status_short; + } }); // TODO (rspeicher): Make the issue description inline-editable like a note so // that we can re-use its form here diff --git a/app/assets/javascripts/merge_request.js b/app/assets/javascripts/merge_request.js index a0bce6ef381..d3bd1e846c1 100644 --- a/app/assets/javascripts/merge_request.js +++ b/app/assets/javascripts/merge_request.js @@ -97,7 +97,11 @@ return $.ajax({ type: 'PATCH', url: $('form.js-issuable-update').attr('action'), - data: patchData + data: patchData, + success: function(mergeRequest) { + document.querySelector('#task_status').innerText = mergeRequest.task_status; + document.querySelector('#task_status_short').innerText = mergeRequest.task_status_short; + } }); // TODO (rspeicher): Make the merge request description inline-editable like a // note so that we can re-use its form here |