diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-08-02 14:51:43 +0300 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-08-12 23:24:46 +0300 |
commit | c2295fbdf8cfd348dfcee04f63c9c9d49646beb3 (patch) | |
tree | 1e930d4439e5f6737996993547077abf15391ea6 /app/assets/javascripts/merge_conflict_data_provider.js.es6 | |
parent | 261d47bce9d7cc80b4c2068cb612411fe51530ee (diff) | |
download | gitlab-ce-c2295fbdf8cfd348dfcee04f63c9c9d49646beb3.tar.gz |
Render right sidebar and handle request error.
Diffstat (limited to 'app/assets/javascripts/merge_conflict_data_provider.js.es6')
-rw-r--r-- | app/assets/javascripts/merge_conflict_data_provider.js.es6 | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/app/assets/javascripts/merge_conflict_data_provider.js.es6 b/app/assets/javascripts/merge_conflict_data_provider.js.es6 index b1f1e7bd78c..05ffc470d3e 100644 --- a/app/assets/javascripts/merge_conflict_data_provider.js.es6 +++ b/app/assets/javascripts/merge_conflict_data_provider.js.es6 @@ -8,6 +8,7 @@ window.MergeConflictDataProvider = class MergeConflictDataProvider { return { isLoading : true, + hasError : false, isParallel : diffViewType === 'parallel', diffViewType : diffViewType, conflictsData : {}, @@ -18,12 +19,19 @@ window.MergeConflictDataProvider = class MergeConflictDataProvider { decorateData(vueInstance, data) { this.vueInstance = vueInstance; - data.shortCommitSha = data.commit_sha.slice(0, 7); - data.commitMesage = data.commit_message; - this.setParallelLines(data); - this.setInlineLines(data); - this.updateResolutionsData(data); + if (data.type === 'error') { + vueInstance.hasError = true; + data.errorMessage = data.message; + } + else { + data.shortCommitSha = data.commit_sha.slice(0, 7); + data.commitMesage = data.commit_message; + + this.setParallelLines(data); + this.setInlineLines(data); + this.updateResolutionsData(data); + } vueInstance.conflictsData = data; } @@ -166,7 +174,7 @@ window.MergeConflictDataProvider = class MergeConflictDataProvider { vi.diffView = newType; vi.isParallel = newType === 'parallel'; $.cookie('diff_view', newType); // TODO: Make sure that cookie path added. - $('.container-fluid').toggleClass('container-limited'); + $('.content-wrapper .container-fluid').toggleClass('container-limited'); } @@ -270,4 +278,10 @@ window.MergeConflictDataProvider = class MergeConflictDataProvider { } } + + handleFailedRequest(vueInstance, data) { + vueInstance.hasError = true; + vueInstance.conflictsData.errorMessage = 'Something went wrong!'; + } + } |