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
c725feb6
Commit
c725feb6
authored
Jun 16, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug 32580
parent
1c46c17a
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
6 additions
and
3 deletions
+6
-3
apps/documenteditor/main/app/controller/Main.js
apps/documenteditor/main/app/controller/Main.js
+1
-0
apps/documenteditor/main/app/view/FileMenu.js
apps/documenteditor/main/app/view/FileMenu.js
+1
-1
apps/presentationeditor/main/app/controller/Main.js
apps/presentationeditor/main/app/controller/Main.js
+1
-0
apps/presentationeditor/main/app/view/FileMenu.js
apps/presentationeditor/main/app/view/FileMenu.js
+1
-1
apps/spreadsheeteditor/main/app/controller/Main.js
apps/spreadsheeteditor/main/app/controller/Main.js
+1
-0
apps/spreadsheeteditor/main/app/view/FileMenu.js
apps/spreadsheeteditor/main/app/view/FileMenu.js
+1
-1
No files found.
apps/documenteditor/main/app/controller/Main.js
View file @
c725feb6
...
...
@@ -932,6 +932,7 @@ define([
this
.
appOptions
.
canLicense
=
params
.
asc_getCanLicense
?
params
.
asc_getCanLicense
()
:
false
;
this
.
appOptions
.
isOffline
=
this
.
api
.
asc_isOffline
();
this
.
appOptions
.
isReviewOnly
=
(
this
.
permissions
.
review
===
true
)
&&
(
this
.
permissions
.
edit
===
false
);
this
.
appOptions
.
canRequestEditRights
=
this
.
editorConfig
.
canRequestEditRights
;
this
.
appOptions
.
canEdit
=
(
this
.
permissions
.
edit
!==
false
||
this
.
permissions
.
review
===
true
)
&&
// can edit or review
(
this
.
editorConfig
.
canRequestEditRights
||
this
.
editorConfig
.
mode
!==
'
view
'
)
&&
// if mode=="view" -> canRequestEditRights must be defined
(
!
this
.
appOptions
.
isReviewOnly
||
this
.
appOptions
.
canLicense
);
// if isReviewOnly==true -> canLicense must be true
...
...
apps/documenteditor/main/app/view/FileMenu.js
View file @
c725feb6
...
...
@@ -217,7 +217,7 @@ define([
// this.hkSaveAs[this.mode.canDownload?'enable':'disable']();
this
.
items
[
1
][
this
.
mode
.
isEdit
?
'
show
'
:
'
hide
'
]();
this
.
items
[
2
][
!
this
.
mode
.
isEdit
&&
this
.
mode
.
canEdit
?
'
show
'
:
'
hide
'
]();
this
.
items
[
2
][
!
this
.
mode
.
isEdit
&&
this
.
mode
.
canEdit
&&
this
.
mode
.
canRequestEditRights
?
'
show
'
:
'
hide
'
]();
this
.
items
[
9
][(
!
this
.
mode
.
isOffline
&&
!
this
.
mode
.
isReviewOnly
&&
this
.
document
&&
this
.
document
.
info
&&
(
this
.
document
.
info
.
sharingSettings
&&
this
.
document
.
info
.
sharingSettings
.
length
>
0
||
...
...
apps/presentationeditor/main/app/controller/Main.js
View file @
c725feb6
...
...
@@ -712,6 +712,7 @@ define([
/** coauthoring end **/
this
.
appOptions
.
isOffline
=
this
.
api
.
asc_isOffline
();
this
.
appOptions
.
canLicense
=
params
.
asc_getCanLicense
?
params
.
asc_getCanLicense
()
:
false
;
this
.
appOptions
.
canRequestEditRights
=
this
.
editorConfig
.
canRequestEditRights
;
this
.
appOptions
.
canEdit
=
this
.
permissions
.
edit
!==
false
&&
// can edit
(
this
.
editorConfig
.
canRequestEditRights
||
this
.
editorConfig
.
mode
!==
'
view
'
);
// if mode=="view" -> canRequestEditRights must be defined
this
.
appOptions
.
isEdit
=
this
.
appOptions
.
canLicense
&&
this
.
appOptions
.
canEdit
&&
this
.
editorConfig
.
mode
!==
'
view
'
;
...
...
apps/presentationeditor/main/app/view/FileMenu.js
View file @
c725feb6
...
...
@@ -215,7 +215,7 @@ define([
// this.hkSaveAs[this.mode.canDownload?'enable':'disable']();
this
.
items
[
1
][
this
.
mode
.
isEdit
?
'
show
'
:
'
hide
'
]();
this
.
items
[
2
][
!
this
.
mode
.
isEdit
&&
this
.
mode
.
canEdit
?
'
show
'
:
'
hide
'
]();
this
.
items
[
2
][
!
this
.
mode
.
isEdit
&&
this
.
mode
.
canEdit
&&
this
.
mode
.
canRequestEditRights
?
'
show
'
:
'
hide
'
]();
this
.
items
[
9
][(
!
this
.
mode
.
isOffline
&&
this
.
document
&&
this
.
document
.
info
&&
(
this
.
document
.
info
.
sharingSettings
&&
this
.
document
.
info
.
sharingSettings
.
length
>
0
||
this
.
mode
.
sharingSettingsUrl
&&
this
.
mode
.
sharingSettingsUrl
.
length
))?
'
show
'
:
'
hide
'
]();
...
...
apps/spreadsheeteditor/main/app/controller/Main.js
View file @
c725feb6
...
...
@@ -736,6 +736,7 @@ define([
}
}
this
.
appOptions
.
canRequestEditRights
=
this
.
editorConfig
.
canRequestEditRights
;
this
.
appOptions
.
canEdit
=
this
.
permissions
.
edit
!==
false
&&
// can edit
(
this
.
editorConfig
.
canRequestEditRights
||
this
.
editorConfig
.
mode
!==
'
view
'
);
// if mode=="view" -> canRequestEditRights must be defined
this
.
appOptions
.
isEdit
=
(
this
.
appOptions
.
canLicense
||
this
.
appOptions
.
isEditDiagram
||
this
.
appOptions
.
isEditMailMerge
)
&&
this
.
permissions
.
edit
!==
false
&&
this
.
editorConfig
.
mode
!==
'
view
'
;
...
...
apps/spreadsheeteditor/main/app/view/FileMenu.js
View file @
c725feb6
...
...
@@ -200,7 +200,7 @@ define([
// this.hkSaveAs[this.mode.canDownload?'enable':'disable']();
this
.
items
[
1
][
this
.
mode
.
isEdit
?
'
show
'
:
'
hide
'
]();
this
.
items
[
2
][
!
this
.
mode
.
isEdit
&&
this
.
mode
.
canEdit
?
'
show
'
:
'
hide
'
]();
this
.
items
[
2
][
!
this
.
mode
.
isEdit
&&
this
.
mode
.
canEdit
&&
this
.
mode
.
canRequestEditRights
?
'
show
'
:
'
hide
'
]();
this
.
items
[
9
][(
!
this
.
mode
.
isOffline
&&
this
.
document
&&
this
.
document
.
info
&&
(
this
.
document
.
info
.
sharingSettings
&&
this
.
document
.
info
.
sharingSettings
.
length
>
0
||
this
.
mode
.
sharingSettingsUrl
&&
this
.
mode
.
sharingSettingsUrl
.
length
))?
'
show
'
:
'
hide
'
]();
...
...
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