Skip to content

O
officejs
Commit f5fefea0 authored by Tristan Cavelier's avatar Tristan Cavelier
Browse files
Options

Fix bug: get method from conflict manager storage can return conflicts

parent 1a985dad
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 37 deletions
OfficeJS/lib/jio/jio.storage.js
View file @ f5fefea0
/*! JIO Storage - v0.1.0 - 2012-08-16
/*! JIO Storage - v0.1.0 - 2012-08-20
* Copyright (c) 2012 Nexedi; Licensed */
(function(LocalOrCookieStorage, $, Base64, sjcl, hex_sha256, Jio) {
......@@ -1793,13 +1793,6 @@ var newConflictManagerStorage = function ( spec, my ) {
doc._creation_date =
metadata_file_content[current_revision]._creation_date;
doc._rev = current_revision;
if (command.getOption('revs')) {
doc._revisions = priv._revs(metadata_file_content,
current_revision);
}
if (command.getOption('revs_info')) {
doc._revs_info = priv._revs_info(metadata_file_content);
}
if (metadata_only) {
am.call(o,'success');
} else {
......@@ -1822,7 +1815,7 @@ var newConflictManagerStorage = function ( spec, my ) {
);
};
o.checkForConflicts = function () {
if (metadata_file_content[current_revision].conflict) {
if (metadata_file_content[current_revision]._conflict) {
on_conflict = true;
conflict_object =
priv.createConflictObject(
......@@ -1831,25 +1824,39 @@ var newConflictManagerStorage = function ( spec, my ) {
current_revision
);
}
if (command.getOption('conflicts')) {
doc._conflicts = conflict_object;
}
am.call(o,'success');
};
o.success = function (){
am.neverCall(o,'error');
am.neverCall(o,'success');
if (command.getOption('revs')) {
doc._revisions = priv._revs(metadata_file_content,
current_revision);
}
if (command.getOption('revs_info')) {
doc._revs_info = priv._revs_info(metadata_file_content);
}
if (command.getOption('conflicts')) {
doc._conflicts = conflict_object;
}
that.success(doc);
};
o.error = function (error){
var gooderror = error || {status:0,statusText:'Unknown',
o.error = function (error) {
var err = error || {status:0,statusText:'Unknown',
message:'Unknown error.'};
if (on_conflict) {
gooderror.conflict_object = conflict_object;
if (command.getOption('revs')) {
err._revisions = priv._revs(metadata_file_content,
current_revision);
}
if (command.getOption('revs_info')) {
err._revs_info = priv._revs_info(metadata_file_content);
}
if (command.getOption('conflicts')) {
err._conflicts = conflict_object;
}
am.neverCall(o,'error');
am.neverCall(o,'success');
that.error(gooderror);
that.error(err);
};
am.call(o,'getDistantMetadata');
};
......
OfficeJS/lib/jio/jio.storage.min.js
View file @ f5fefea0
This diff is collapsed.
OfficeJS/src/jio.storage/conflictmanagerstorage.js
View file @ f5fefea0
......@@ -569,13 +569,6 @@ var newConflictManagerStorage = function ( spec, my ) {
doc._creation_date =
metadata_file_content[current_revision]._creation_date;
doc._rev = current_revision;
if (command.getOption('revs')) {
doc._revisions = priv._revs(metadata_file_content,
current_revision);
}
if (command.getOption('revs_info')) {
doc._revs_info = priv._revs_info(metadata_file_content);
}
if (metadata_only) {
am.call(o,'success');
} else {
......@@ -598,7 +591,7 @@ var newConflictManagerStorage = function ( spec, my ) {
);
};
o.checkForConflicts = function () {
if (metadata_file_content[current_revision].conflict) {
if (metadata_file_content[current_revision]._conflict) {
on_conflict = true;
conflict_object =
priv.createConflictObject(
......@@ -607,25 +600,39 @@ var newConflictManagerStorage = function ( spec, my ) {
current_revision
);
}
if (command.getOption('conflicts')) {
doc._conflicts = conflict_object;
}
am.call(o,'success');
};
o.success = function (){
am.neverCall(o,'error');
am.neverCall(o,'success');
if (command.getOption('revs')) {
doc._revisions = priv._revs(metadata_file_content,
current_revision);
}
if (command.getOption('revs_info')) {
doc._revs_info = priv._revs_info(metadata_file_content);
}
if (command.getOption('conflicts')) {
doc._conflicts = conflict_object;
}
that.success(doc);
};
o.error = function (error){
var gooderror = error || {status:0,statusText:'Unknown',
o.error = function (error) {
var err = error || {status:0,statusText:'Unknown',
message:'Unknown error.'};
if (on_conflict) {
gooderror.conflict_object = conflict_object;
if (command.getOption('revs')) {
err._revisions = priv._revs(metadata_file_content,
current_revision);
}
if (command.getOption('revs_info')) {
err._revs_info = priv._revs_info(metadata_file_content);
}
if (command.getOption('conflicts')) {
err._conflicts = conflict_object;
}
am.neverCall(o,'error');
am.neverCall(o,'success');
that.error(gooderror);
that.error(err);
};
am.call(o,'getDistantMetadata');
};
......
OfficeJS/test/jiotests.js
View file @ f5fefea0
......@@ -1622,6 +1622,7 @@ test ('Revision Conflict', function() {
o.rev.third = err.rev;
err.rev = checkRev(err.rev);
if (err.conflicts && err.conflicts.rows) {
o.tmp = err.conflicts;
o.solveConflict = checkConflictRow (err.conflicts.rows[0]);
}
for (k in {'error':0,'message':0,'reason':0,'statusText':0}) {
......@@ -1654,11 +1655,15 @@ test ('Revision Conflict', function() {
o.tick(o);
o.checkContent ('file.doc.'+o.rev.third);
// loading test
o.spy(o,'value',{_id:'file.doc',_rev:o.rev.third,content:'content3'},
o.spy(o,'value',{_id:'file.doc',_rev:o.rev.third,content:'content3',
_conflicts:o.tmp},
'loading "file.doc" -> conflict!');
o.jio.get('file.doc',function (err,val) {
o.jio.get('file.doc',{conflicts:true},function (err,val) {
var k;
if (val) {
if (val._conflicts && val._conflicts.rows) {
checkConflictRow (val._conflicts.rows[0]);
}
for (k in {'_creation_date':0,'_last_modified':0}) {
if (val[k]) {
delete val[k];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7