Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
web-apps
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
web-apps
Commits
da80aa9b
Commit
da80aa9b
authored
Mar 25, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Versions History: изменено поле urlDiff на changesUrl.
parent
cfe43359
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
apps/api/documents/index.html
apps/api/documents/index.html
+2
-1
apps/common/main/lib/controller/History.js
apps/common/main/lib/controller/History.js
+4
-3
No files found.
apps/api/documents/index.html
View file @
da80aa9b
...
@@ -165,7 +165,8 @@
...
@@ -165,7 +165,8 @@
{
{
'
version
'
:
revision
.
data
,
'
version
'
:
revision
.
data
,
'
url
'
:
'
http://isa2
'
,
'
url
'
:
'
http://isa2
'
,
'
urlDiff
'
:
'
http://isa2
'
'
urlDiff
'
:
'
http://isa2
'
,
'
changesUrl
'
:
'
http://isa2
'
}
}
);
);
}
}
...
...
apps/common/main/lib/controller/History.js
View file @
da80aa9b
...
@@ -100,18 +100,19 @@ define([
...
@@ -100,18 +100,19 @@ define([
if
(
historyStore
&&
data
!==
null
)
{
if
(
historyStore
&&
data
!==
null
)
{
var
rev
,
revisions
=
historyStore
.
findRevisions
(
data
.
version
),
var
rev
,
revisions
=
historyStore
.
findRevisions
(
data
.
version
),
urlGetTime
=
new
Date
();
urlGetTime
=
new
Date
();
var
diff
=
opts
.
data
.
urlDiff
||
opts
.
data
.
changesUrl
;
if
(
revisions
&&
revisions
.
length
>
0
)
{
if
(
revisions
&&
revisions
.
length
>
0
)
{
for
(
var
i
=
0
;
i
<
revisions
.
length
;
i
++
)
{
for
(
var
i
=
0
;
i
<
revisions
.
length
;
i
++
)
{
rev
=
revisions
[
i
];
rev
=
revisions
[
i
];
rev
.
set
(
'
url
'
,
opts
.
data
.
url
,
{
silent
:
true
});
rev
.
set
(
'
url
'
,
opts
.
data
.
url
,
{
silent
:
true
});
rev
.
set
(
'
urlDiff
'
,
opts
.
data
.
urlD
iff
,
{
silent
:
true
});
rev
.
set
(
'
urlDiff
'
,
d
iff
,
{
silent
:
true
});
rev
.
set
(
'
urlGetTime
'
,
urlGetTime
,
{
silent
:
true
});
rev
.
set
(
'
urlGetTime
'
,
urlGetTime
,
{
silent
:
true
});
}
}
}
}
var
hist
=
new
Asc
.
asc_CVersionHistory
();
var
hist
=
new
Asc
.
asc_CVersionHistory
();
hist
.
asc_setUrl
(
opts
.
data
.
url
);
hist
.
asc_setUrl
(
opts
.
data
.
url
);
hist
.
asc_setUrlChanges
(
opts
.
data
.
urlD
iff
);
hist
.
asc_setUrlChanges
(
d
iff
);
hist
.
asc_setDocId
(
_
.
isEmpty
(
opts
.
data
.
urlD
iff
)
?
this
.
currentDocId
:
this
.
currentDocIdPrev
);
hist
.
asc_setDocId
(
_
.
isEmpty
(
d
iff
)
?
this
.
currentDocId
:
this
.
currentDocIdPrev
);
hist
.
asc_setCurrentChangeId
(
this
.
currentChangeId
);
hist
.
asc_setCurrentChangeId
(
this
.
currentChangeId
);
hist
.
asc_setArrColors
(
this
.
currentArrColors
);
hist
.
asc_setArrColors
(
this
.
currentArrColors
);
this
.
api
.
asc_showRevision
(
hist
);
this
.
api
.
asc_showRevision
(
hist
);
...
...
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