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
f07f5d1f
Commit
f07f5d1f
authored
Mar 31, 2017
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[DE] Enable mail merge for desktop application.
parent
85cbad20
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
apps/documenteditor/main/app/controller/Main.js
apps/documenteditor/main/app/controller/Main.js
+1
-1
No files found.
apps/documenteditor/main/app/controller/Main.js
View file @
f07f5d1f
...
...
@@ -965,7 +965,7 @@ define([
this
.
appOptions
.
canUseHistory
=
this
.
appOptions
.
canLicense
&&
!
this
.
appOptions
.
isLightVersion
&&
this
.
editorConfig
.
canUseHistory
&&
this
.
appOptions
.
canCoAuthoring
&&
!
this
.
appOptions
.
isDesktopApp
;
this
.
appOptions
.
canHistoryClose
=
this
.
editorConfig
.
canHistoryClose
;
this
.
appOptions
.
canHistoryRestore
=
this
.
editorConfig
.
canHistoryRestore
&&
!!
this
.
permissions
.
changeHistory
;
this
.
appOptions
.
canUseMailMerge
=
this
.
appOptions
.
canLicense
&&
this
.
appOptions
.
canEdit
&&
!
this
.
appOptions
.
isDesktopApp
;
this
.
appOptions
.
canUseMailMerge
=
this
.
appOptions
.
canLicense
&&
this
.
appOptions
.
canEdit
&&
/*!this.appOptions.isDesktopApp*/
!
this
.
appOptions
.
isOffline
;
this
.
appOptions
.
canSendEmailAddresses
=
this
.
appOptions
.
canLicense
&&
this
.
editorConfig
.
canSendEmailAddresses
&&
this
.
appOptions
.
canEdit
&&
this
.
appOptions
.
canCoAuthoring
;
this
.
appOptions
.
canComments
=
(
licType
===
Asc
.
c_oLicenseResult
.
Success
||
licType
===
Asc
.
c_oLicenseResult
.
SuccessLimit
)
&&
!
((
typeof
(
this
.
editorConfig
.
customization
)
==
'
object
'
)
&&
this
.
editorConfig
.
customization
.
comments
===
false
);
this
.
appOptions
.
canChat
=
(
licType
===
Asc
.
c_oLicenseResult
.
Success
||
licType
===
Asc
.
c_oLicenseResult
.
SuccessLimit
)
&&
!
this
.
appOptions
.
isOffline
&&
!
((
typeof
(
this
.
editorConfig
.
customization
)
==
'
object
'
)
&&
this
.
editorConfig
.
customization
.
chat
===
false
);
...
...
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