From: Łukasz Rekucki Date: Tue, 29 Sep 2009 14:57:00 +0000 (+0200) Subject: Merge branch 'master' of stigma:platforma X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/e3cc953f09c067377e01d1e003927b969997edde?ds=inline;hp=-c Merge branch 'master' of stigma:platforma Conflicts: project/static/js/models.js --- e3cc953f09c067377e01d1e003927b969997edde diff --combined project/static/js/models.js index f6725a5f,13dc2ea0..5d3fac49 --- a/project/static/js/models.js +++ b/project/static/js/models.js @@@ -45,9 -45,10 +45,10 @@@ Editor.XMLModel = Editor.Model.extend( data: '', state: 'empty', - init: function(serverURL) { + init: function(serverURL, revision) { this._super(); this.set('state', 'empty'); + this.set('revision', revision); this.serverURL = serverURL; this.toolbarButtonsModel = new Editor.ToolbarButtonsModel(); this.addObserver(this, 'data', this.dataChanged.bind(this)); @@@ -59,6 -60,7 +60,7 @@@ $.ajax({ url: this.serverURL, dataType: 'text', + data: {revision: this.get('revision')}, success: this.loadingSucceeded.bind(this) }); return true; @@@ -71,7 -73,8 +73,8 @@@ this.set('state', 'updating'); var payload = { - contents: this.get('data') + contents: this.get('data'), + revision: this.get('revision') }; if (message) { payload.message = message; @@@ -139,9 -142,10 +142,10 @@@ Editor.HTMLModel = Editor.Model.extend( data: '', state: 'empty', - init: function(serverURL) { + init: function(serverURL, revision) { this._super(); this.set('state', 'empty'); + this.set('revision', revision); this.serverURL = serverURL; }, @@@ -151,6 -155,7 +155,7 @@@ $.ajax({ url: this.serverURL, dataType: 'text', + data: {revision: this.get('revision')}, success: this.loadingSucceeded.bind(this) }); } @@@ -176,8 -181,7 +181,8 @@@ Editor.ImageGalleryModel = Editor.Model.extend({ _className: 'Editor.ImageGalleryModel', - serverURL: null, + serverURL: null, + data: [], state: 'empty', init: function(serverURL) { @@@ -185,7 -189,7 +190,7 @@@ this.set('state', 'empty'); this.serverURL = serverURL; // olewać data - this.pages = [] + this.pages = []; }, load: function() { @@@ -204,15 -208,7 +209,15 @@@ alert('erroneous state:', this.get('state')); } - this.set('pages', data[0].pages); + $.log('galleries:', data); + + if (data.length == 0) + this.set('data', []); + else { + $.log('dupa'); + this.set('data', data[0].pages); - } - ++ } ++ this.set('state', 'synced'); }, @@@ -227,7 -223,7 +232,7 @@@ Editor.DocumentModel = Editor.Model.extend({ _className: 'Editor.DocumentModel', - data: null, // name, text_url, latest_rev, latest_shared_rev, parts_url, dc_url, size + data: null, // name, text_url, user_revision, latest_shared_rev, parts_url, dc_url, size, merge_url contentModels: {}, state: 'empty', @@@ -253,8 -249,8 +258,8 @@@ this.set('data', data); this.set('state', 'synced'); this.contentModels = { - 'xml': new Editor.XMLModel(data.text_url), - 'html': new Editor.HTMLModel(data.html_url), + 'xml': new Editor.XMLModel(data.text_url, data.user_revision), + 'html': new Editor.HTMLModel(data.html_url, data.user_revision), 'gallery': new Editor.ImageGalleryModel(data.gallery_url) }; for (var key in this.contentModels) { @@@ -292,11 -288,66 +297,66 @@@ }, update: function() { - + this.set('state', 'loading'); + $.ajax({ + url: this.data.merge_url, + dataType: 'json', + type: 'post', + data: { + type: 'update', + target_revision: this.data.user_revision + }, + complete: this.updateCompleted.bind(this), + success: function(data) { this.set('updateData', data); }.bind(this) + }); }, - merge: function() { - + updateCompleted: function(xhr, textStatus) { + console.log(xhr.status, textStatus); + if (xhr.status == 200) { // Sukces + this.data.user_revision = this.get('updateData').revision; + for (var key in this.contentModels) { + this.contentModels[key].set('revision', this.data.user_revision); + this.contentModels[key].set('state', 'empty'); + } + } else if (xhr.status == 202) { // Wygenerowano PullRequest + } else if (xhr.status == 204) { // Nic nie zmieniono + } else if (xhr.status == 409) { // Konflikt podczas operacji + } + this.set('state', 'synced'); + this.set('updateData', null); + }, + + merge: function(message) { + this.set('state', 'loading'); + $.ajax({ + url: this.data.merge_url, + type: 'post', + dataType: 'json', + data: { + type: 'share', + target_revision: this.data.user_revision, + message: message + }, + complete: this.mergeCompleted.bind(this), + success: function(data) { this.set('mergeData', data); }.bind(this) + }); + }, + + mergeCompleted: function(xhr, textStatus) { + console.log(xhr.status, textStatus); + if (xhr.status == 200) { // Sukces + this.data.user_revision = this.get('mergeData').revision; + for (var key in this.contentModels) { + this.contentModels[key].set('revision', this.data.user_revision); + this.contentModels[key].set('state', 'empty'); + } + } else if (xhr.status == 202) { // Wygenerowano PullRequest (tutaj?) + } else if (xhr.status == 204) { // Nic nie zmieniono + } else if (xhr.status == 409) { // Konflikt podczas operacji + } + this.set('state', 'synced'); + this.set('mergeData', null); }, // For debbuging