CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-28 19:01:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Conflict Resolution WIP: check server versions of modified nodes before sending changeset

Browse Source
This commit is contained in:
Bryan Housel
2014-11-30 00:56:40 -05:00
parent 5ca46fbbfb
commit ba919b8168
1 changed files with 69 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/id/modes/save.js
+69 -21
View File
@@ -8,34 +8,82 @@ iD.modes.Save = function(context) {
}
function save(e) {
var loading = iD.ui.Loading(context)
.message(t('save.uploading'))
.blocking(true);
var altGraph = iD.Graph(),
history = context.history(),
connection = context.connection(),
changes = history.changes(iD.actions.DiscardTags(history.difference())),
toCheck = _.pluck(changes.modified, 'id'),
loading = iD.ui.Loading(context).message(t('save.uploading')).blocking(true),
errors = [];
context.container()
.call(loading);
context.connection().putChangeset(
context.history().changes(iD.actions.DiscardTags(context.history().difference())),
e.comment,
context.history().imageryUsed(),
function(err, changeset_id) {
loading.close();
// check for version conflicts.. reload modified entities into an alternate graph.
context.altGraph(altGraph);
_.each(toCheck, function(id) {
connection.loadEntity(id, function(err) {
var version = context.entity(id).version,
altVersion = context.altGraph().entity(id).version;
toCheck = _.without(toCheck, id);
if (version !== altVersion) {
errors.push('Version mismatch for ' + id + ': local=' + version + ', server=' + altVersion);
}
if (err) {
var confirm = iD.ui.confirm(context.container());
confirm
.select('.modal-section.header')
.append('h3')
.text(t('save.error'));
confirm
.select('.modal-section.message-text')
.append('p')
.text(err.responseText || t('save.unknown_error_details'));
} else {
context.flush();
success(e, changeset_id);
errors.push(err.responseText);
}
if (!toCheck.length) {
finalize();
}
});
});
function finalize() {
if (errors.length) {
showErrors(errors);
} else {
connection.putChangeset(
changes,
e.comment,
history.imageryUsed(),
function(err, changeset_id) {
if (err) {
errors.push(err.responseText);
showErrors(errors);
} else {
loading.close();
context.flush();
success(e, changeset_id);
}
});
}
}
function showErrors(errors) {
var confirm = iD.ui.confirm(context.container());
context.altGraph(undefined);
loading.close();
confirm
.select('.modal-section.header')
.append('h3')
.text(t('save.error'));
confirm
.select('.modal-section.message-text')
.append('p')
.text(errors.join('<br/>') || t('save.unknown_error_details'));
}
}
function success(e, changeset_id) {