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
7e1f1ebc
Commit
7e1f1ebc
authored
Oct 05, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[DE] Check build versions for editor and revisions in versions history.
parent
f9613e3a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
34 additions
and
31 deletions
+34
-31
apps/documenteditor/main/app/controller/Main.js
apps/documenteditor/main/app/controller/Main.js
+34
-31
No files found.
apps/documenteditor/main/app/controller/Main.js
View file @
7e1f1ebc
...
...
@@ -421,39 +421,41 @@ define([
var
changes
=
version
.
changes
,
change
,
i
;
if
(
changes
&&
changes
.
length
>
0
)
{
arrVersions
[
arrVersions
.
length
-
1
].
set
(
'
changeid
'
,
changes
.
length
-
1
);
arrVersions
[
arrVersions
.
length
-
1
].
set
(
'
docIdPrev
'
,
docIdPrev
);
arrVersions
[
arrVersions
.
length
-
1
].
set
(
'
hasChanges
'
,
changes
.
length
>
1
);
for
(
i
=
changes
.
length
-
2
;
i
>=
0
;
i
--
)
{
change
=
changes
[
i
];
user
=
usersStore
.
findUser
(
change
.
user
.
id
);
if
(
!
user
)
{
user
=
new
Common
.
Models
.
User
({
id
:
change
.
user
.
id
,
username
:
change
.
user
.
name
,
colorval
:
Asc
.
c_oAscArrUserColors
[
usersCnt
],
color
:
this
.
generateUserColor
(
Asc
.
c_oAscArrUserColors
[
usersCnt
++
])
});
usersStore
.
add
(
user
);
if
(
version
.
buildVersion
&&
version
.
buildVersion
==
this
.
appOptions
.
buildVersion
)
{
arrVersions
[
arrVersions
.
length
-
1
].
set
(
'
changeid
'
,
changes
.
length
-
1
);
arrVersions
[
arrVersions
.
length
-
1
].
set
(
'
hasChanges
'
,
changes
.
length
>
1
);
for
(
i
=
changes
.
length
-
2
;
i
>=
0
;
i
--
)
{
change
=
changes
[
i
];
user
=
usersStore
.
findUser
(
change
.
user
.
id
);
if
(
!
user
)
{
user
=
new
Common
.
Models
.
User
({
id
:
change
.
user
.
id
,
username
:
change
.
user
.
name
,
colorval
:
Asc
.
c_oAscArrUserColors
[
usersCnt
],
color
:
this
.
generateUserColor
(
Asc
.
c_oAscArrUserColors
[
usersCnt
++
])
});
usersStore
.
add
(
user
);
}
arrVersions
.
push
(
new
Common
.
Models
.
HistoryVersion
({
version
:
version
.
versionGroup
,
revision
:
version
.
version
,
changeid
:
i
,
userid
:
change
.
user
.
id
,
username
:
change
.
user
.
name
,
usercolor
:
user
.
get
(
'
color
'
),
created
:
change
.
created
,
docId
:
version
.
key
,
docIdPrev
:
docIdPrev
,
selected
:
false
,
canRestore
:
this
.
appOptions
.
canHistoryRestore
,
isRevision
:
false
,
isVisible
:
true
}));
arrColors
.
push
(
user
.
get
(
'
colorval
'
));
}
arrVersions
.
push
(
new
Common
.
Models
.
HistoryVersion
({
version
:
version
.
versionGroup
,
revision
:
version
.
version
,
changeid
:
i
,
userid
:
change
.
user
.
id
,
username
:
change
.
user
.
name
,
usercolor
:
user
.
get
(
'
color
'
),
created
:
change
.
created
,
docId
:
version
.
key
,
docIdPrev
:
docIdPrev
,
selected
:
false
,
canRestore
:
this
.
appOptions
.
canHistoryRestore
,
isRevision
:
false
,
isVisible
:
true
}));
arrColors
.
push
(
user
.
get
(
'
colorval
'
));
}
}
else
if
(
ver
==
0
&&
versions
.
length
==
1
)
{
arrVersions
[
arrVersions
.
length
-
1
].
set
(
'
docId
'
,
version
.
key
+
'
1
'
);
...
...
@@ -972,6 +974,7 @@ define([
this
.
appOptions
.
canEditStyles
=
this
.
appOptions
.
canLicense
&&
this
.
appOptions
.
canEdit
;
this
.
appOptions
.
canPrint
=
(
this
.
permissions
.
print
!==
false
);
this
.
appOptions
.
canRename
=
!!
this
.
permissions
.
rename
;
this
.
appOptions
.
buildVersion
=
params
.
asc_getBuildVersion
();
var
type
=
/^
(?:(
pdf|djvu|xps
))
$/
.
exec
(
this
.
document
.
fileType
);
this
.
appOptions
.
canDownloadOrigin
=
!
this
.
appOptions
.
nativeApp
&&
this
.
permissions
.
download
!==
false
&&
(
type
&&
typeof
type
[
1
]
===
'
string
'
);
...
...
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