Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
officejs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
officejs
Commits
4ac3936c
Commit
4ac3936c
authored
Aug 16, 2012
by
Tristan Cavelier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bug: no conflict object was returned from Conflict Manager allDocs method.
parent
6c2edc36
Changes
4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
149 additions
and
20 deletions
+149
-20
OfficeJS/lib/jio/jio.storage.js
OfficeJS/lib/jio/jio.storage.js
+16
-9
OfficeJS/lib/jio/jio.storage.min.js
OfficeJS/lib/jio/jio.storage.min.js
+2
-2
OfficeJS/src/jio.storage/conflictmanagerstorage.js
OfficeJS/src/jio.storage/conflictmanagerstorage.js
+15
-8
OfficeJS/test/jiotests.js
OfficeJS/test/jiotests.js
+116
-1
No files found.
OfficeJS/lib/jio/jio.storage.js
View file @
4ac3936c
/*! JIO Storage - v0.1.0 - 2012-08-1
4
/*! JIO Storage - v0.1.0 - 2012-08-1
6
* Copyright (c) 2012 Nexedi; Licensed */
(
function
(
LocalOrCookieStorage
,
$
,
Base64
,
sjcl
,
hex_sha256
,
Jio
)
{
...
...
@@ -1862,7 +1862,7 @@ var newConflictManagerStorage = function ( spec, my ) {
that
.
allDocs
=
function
(
command
)
{
var
o
=
{},
am
=
priv
.
newAsyncModule
(),
metadata_only
=
command
.
getOption
(
'
metadata_only
'
),
result_list
=
[],
result_list
=
[],
conflict_object
=
{
total_rows
:
0
,
rows
:[]},
nb_loaded_file
=
0
,
success_count
=
0
,
success_max
=
0
;
o
.
retreiveList
=
function
()
{
...
...
@@ -1898,8 +1898,7 @@ var newConflictManagerStorage = function ( spec, my ) {
var
revision
=
priv
.
chooseARevision
(
data
);
if
(
!
data
[
revision
].
_deleted
)
{
am
.
call
(
o
,
'
loadFile
'
,
[
path
,
revision
,
data
]
o
,
'
loadFile
'
,[
path
,
revision
,
data
]
);
}
else
{
am
.
call
(
o
,
'
success
'
);
...
...
@@ -1917,15 +1916,18 @@ var newConflictManagerStorage = function ( spec, my ) {
_rev
:
revision
}
};
if
(
command
.
getOption
(
'
revs
'
))
{
doc
.
value
.
_revisions
=
priv
.
_revs
(
data
,
revision
);
}
if
(
command
.
getOption
(
'
revs_info
'
))
{
doc
.
value
.
_revs_info
=
priv
.
_revs_info
(
data
,
revision
);
}
if
(
command
.
getOption
(
'
conflicts
'
))
{
if
(
data
[
revision
].
_conflict
)
{
doc
.
value
.
_conflicts
=
priv
.
createConflictObject
(
command
,
data
,
revision
);
}
else
{
doc
.
value
.
_conflicts
=
{
total_rows
:
0
,
rows
:[]}
;
conflict_object
.
total_rows
++
;
conflict_object
.
rows
.
push
(
priv
.
createConflictRow
(
command
,
path
,
data
,
revision
))
;
}
}
if
(
!
metadata_only
)
{
...
...
@@ -1944,10 +1946,15 @@ var newConflictManagerStorage = function ( spec, my ) {
}
};
o
.
success
=
function
(){
var
obj
;
success_count
++
;
if
(
success_count
>=
success_max
)
{
am
.
end
();
that
.
success
({
total_rows
:
result_list
.
length
,
rows
:
result_list
});
obj
=
{
total_rows
:
result_list
.
length
,
rows
:
result_list
};
if
(
command
.
getOption
(
'
conflicts
'
))
{
obj
.
conflicts
=
conflict_object
;
}
that
.
success
(
obj
);
}
};
o
.
error
=
function
(
error
){
...
...
OfficeJS/lib/jio/jio.storage.min.js
View file @
4ac3936c
This diff is collapsed.
Click to expand it.
OfficeJS/src/jio.storage/conflictmanagerstorage.js
View file @
4ac3936c
...
...
@@ -638,7 +638,7 @@ var newConflictManagerStorage = function ( spec, my ) {
that
.
allDocs
=
function
(
command
)
{
var
o
=
{},
am
=
priv
.
newAsyncModule
(),
metadata_only
=
command
.
getOption
(
'
metadata_only
'
),
result_list
=
[],
result_list
=
[],
conflict_object
=
{
total_rows
:
0
,
rows
:[]},
nb_loaded_file
=
0
,
success_count
=
0
,
success_max
=
0
;
o
.
retreiveList
=
function
()
{
...
...
@@ -674,8 +674,7 @@ var newConflictManagerStorage = function ( spec, my ) {
var
revision
=
priv
.
chooseARevision
(
data
);
if
(
!
data
[
revision
].
_deleted
)
{
am
.
call
(
o
,
'
loadFile
'
,
[
path
,
revision
,
data
]
o
,
'
loadFile
'
,[
path
,
revision
,
data
]
);
}
else
{
am
.
call
(
o
,
'
success
'
);
...
...
@@ -693,15 +692,18 @@ var newConflictManagerStorage = function ( spec, my ) {
_rev
:
revision
}
};
if
(
command
.
getOption
(
'
revs
'
))
{
doc
.
value
.
_revisions
=
priv
.
_revs
(
data
,
revision
);
}
if
(
command
.
getOption
(
'
revs_info
'
))
{
doc
.
value
.
_revs_info
=
priv
.
_revs_info
(
data
,
revision
);
}
if
(
command
.
getOption
(
'
conflicts
'
))
{
if
(
data
[
revision
].
_conflict
)
{
doc
.
value
.
_conflicts
=
priv
.
createConflictObject
(
command
,
data
,
revision
);
}
else
{
doc
.
value
.
_conflicts
=
{
total_rows
:
0
,
rows
:[]}
;
conflict_object
.
total_rows
++
;
conflict_object
.
rows
.
push
(
priv
.
createConflictRow
(
command
,
path
,
data
,
revision
))
;
}
}
if
(
!
metadata_only
)
{
...
...
@@ -720,10 +722,15 @@ var newConflictManagerStorage = function ( spec, my ) {
}
};
o
.
success
=
function
(){
var
obj
;
success_count
++
;
if
(
success_count
>=
success_max
)
{
am
.
end
();
that
.
success
({
total_rows
:
result_list
.
length
,
rows
:
result_list
});
obj
=
{
total_rows
:
result_list
.
length
,
rows
:
result_list
};
if
(
command
.
getOption
(
'
conflicts
'
))
{
obj
.
conflicts
=
conflict_object
;
}
that
.
success
(
obj
);
}
};
o
.
error
=
function
(
error
){
...
...
OfficeJS/test/jiotests.js
View file @
4ac3936c
...
...
@@ -151,7 +151,8 @@ makeRevsAccordingToRevsInfo = function (revs,revs_info) {
},
checkRev
=
function
(
rev
)
{
if
(
typeof
rev
===
'
string
'
)
{
if
(
parseInt
(
rev
.
split
(
'
-
'
)[
0
],
10
)
>
0
)
{
if
(
rev
.
split
(
'
-
'
).
length
>
1
&&
parseInt
(
rev
.
split
(
'
-
'
)[
0
],
10
)
>
0
)
{
return
rev
;
}
}
...
...
@@ -2081,6 +2082,120 @@ test ('Load Revisions', function () {
o
.
jio
.
stop
();
});
test
(
'
Get revision List
'
,
function
()
{
var
o
=
{};
o
.
clock
=
this
.
sandbox
.
useFakeTimers
();
o
.
t
=
this
;
o
.
clock
.
tick
(
base_tick
);
o
.
spy
=
basic_spy_function
;
o
.
tick
=
basic_tick_function
;
o
.
secondstorage_spec
=
{
type
:
'
local
'
,
username
:
'
getrevisionlist
'
,
applicationname
:
'
jiotests
'
}
o
.
rev
=
{};
//////////////////////////////////////////////////////////////////////
o
.
jio
=
JIO
.
newJio
({
type
:
'
conflictmanager
'
,
storage
:
o
.
secondstorage_spec
});
o
.
spy
(
o
,
'
value
'
,{
total_rows
:
0
,
rows
:[]},
'
Get revision list
'
);
o
.
jio
.
allDocs
(
o
.
f
);
o
.
tick
(
o
);
o
.
spy
(
o
,
'
value
'
,{
total_rows
:
0
,
rows
:[],
conflicts
:{
total_rows
:
0
,
rows
:[]}},
'
Get revision list with informations
'
);
o
.
jio
.
allDocs
({
conflicts
:
true
,
revs
:
true
,
info_revs
:
true
},
o
.
f
);
o
.
tick
(
o
);
o
.
spy
(
o
,
'
jobstatus
'
,
'
done
'
,
'
saving file
'
);
o
.
jio
.
put
({
_id
:
'
file
'
,
content
:
'
content file
'
},
function
(
err
,
val
)
{
o
.
rev
.
file1
=
val
?
val
.
rev
:
undefined
;
o
.
f
(
err
,
val
);
});
o
.
tick
(
o
);
o
.
spy
(
o
,
'
jobstatus
'
,
'
done
'
,
'
saving memo
'
);
o
.
jio
.
put
({
_id
:
'
memo
'
,
content
:
'
content memo
'
},
function
(
err
,
val
)
{
o
.
rev
.
memo1
=
val
?
val
.
rev
:
undefined
;
o
.
f
(
err
,
val
);
});
o
.
tick
(
o
);
o
.
spy
(
o
,
'
status
'
,
409
,
'
saving memo conflict
'
);
o
.
jio
.
put
({
_id
:
'
memo
'
,
content
:
'
content memo
'
},
function
(
err
,
val
)
{
o
.
rev
.
memo2
=
err
?
err
.
rev
:
undefined
;
o
.
f
(
err
,
val
);
});
o
.
tick
(
o
);
o
.
f
=
o
.
t
.
spy
();
o
.
jio
.
allDocs
(
function
(
err
,
val
)
{
var
i
;
if
(
val
)
{
for
(
i
=
0
;
i
<
val
.
total_rows
;
i
+=
1
)
{
val
.
rows
[
i
].
value
.
_creation_date
=
val
.
rows
[
i
].
value
.
_creation_date
?
true
:
undefined
;
val
.
rows
[
i
].
value
.
_last_modified
=
val
.
rows
[
i
].
value
.
_last_modified
?
true
:
undefined
;
o
.
rev
[
i
]
=
checkRev
(
val
.
rows
[
i
].
value
.
_rev
);
}
}
deepEqual
(
err
||
val
,{
total_rows
:
2
,
rows
:[{
id
:
'
file
'
,
key
:
'
file
'
,
value
:{
_creation_date
:
true
,
_last_modified
:
true
,
_rev
:
o
.
rev
[
0
]
}
},{
id
:
'
memo
'
,
key
:
'
memo
'
,
value
:{
_creation_date
:
true
,
_last_modified
:
true
,
_rev
:
o
.
rev
[
1
]
}
}]},
'
Get revision list after adding 2 files
'
);
o
.
f
();
});
o
.
tick
(
o
);
o
.
f
=
o
.
t
.
spy
();
o
.
jio
.
allDocs
(
{
conflicts
:
true
,
revs
:
true
,
revs_info
:
true
},
function
(
err
,
val
)
{
var
i
;
if
(
val
)
{
for
(
i
=
0
;
i
<
val
.
total_rows
;
i
+=
1
)
{
val
.
rows
[
i
].
value
.
_creation_date
=
val
.
rows
[
i
].
value
.
_creation_date
?
true
:
undefined
;
val
.
rows
[
i
].
value
.
_last_modified
=
val
.
rows
[
i
].
value
.
_last_modified
?
true
:
undefined
;
if
(
val
.
conflicts
&&
val
.
conflicts
.
rows
)
{
o
.
solveConflict
=
checkConflictRow
(
val
.
conflicts
.
rows
[
0
]);
}
}
}
deepEqual
(
err
||
val
,{
total_rows
:
2
,
rows
:[{
id
:
'
file
'
,
key
:
'
file
'
,
value
:{
_creation_date
:
true
,
_last_modified
:
true
,
_revisions
:{
start
:
1
,
ids
:[
getHashFromRev
(
o
.
rev
.
file1
)]},
_rev
:
o
.
rev
.
file1
,
_revs_info
:[{
rev
:
o
.
rev
.
file1
,
status
:
'
available
'
}]
}
},{
id
:
'
memo
'
,
key
:
'
memo
'
,
value
:{
_creation_date
:
true
,
_last_modified
:
true
,
_revisions
:{
start
:
1
,
ids
:[
getHashFromRev
(
o
.
rev
.
memo2
)]},
_rev
:
o
.
rev
.
memo2
,
_revs_info
:[{
rev
:
o
.
rev
.
memo1
,
status
:
'
available
'
},{
rev
:
o
.
rev
.
memo2
,
status
:
'
available
'
}]
}
}],
conflicts
:{
total_rows
:
1
,
rows
:[{
id
:
'
memo
'
,
key
:[
o
.
rev
.
memo1
,
o
.
rev
.
memo2
],
value
:{
_solveConflict
:
'
function
'
}
}]}
},
'
Get revision list with informations after adding 2 files
'
);
o
.
f
();
});
o
.
tick
(
o
);
o
.
jio
.
stop
();
});
};
// end thisfun
if
(
window
.
requirejs
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment