holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Calendar: Do not show Infolog list (Open ToDo's) if user has no access to Infolog, or no Infolog types selected for display

Browse Source
This commit is contained in:
nathangray 2020-05-07 10:24:22 -06:00
parent be32da9ff4
commit 4fb18a658e
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calendar/js/app.js
View File

@ -2372,7 +2372,9 @@ var CalendarApp = /** @class */ (function (_super) {
state.state.last = state.state.last.toJSON();
// Toggle todos
if ((state.state.view == 'day' || this.state.view == 'day') && jQuery(view.etemplates[0].DOMContainer).is(':visible')) {
if (state.state.view == 'day' && state.state.owner.length === 1 && !isNaN(state.state.owner) && state.state.owner[0] >= 0 && !egwIsMobile()) {
if (state.state.view == 'day' && state.state.owner.length === 1 && !isNaN(state.state.owner) && state.state.owner[0] >= 0 && !egwIsMobile()
// Check preferences and permissions
&& egw.user('apps')['infolog'] && egw.preference('cal_show', 'infolog') !== '0') {
// Set width to 70%, otherwise if a scrollbar is needed for the view, it will conflict with the todo list
jQuery(CalendarApp.views.day.etemplates[0].DOMContainer).css("width", "70%");
jQuery(view.etemplates[1].DOMContainer).css({ "left": "70%", "height": (jQuery(framework.tabsUi.activeTab.contentDiv).height() - 30) + 'px' });

5
calendar/js/app.ts
View File

@ -2716,7 +2716,10 @@ class CalendarApp extends EgwApp
// Toggle todos
if((state.state.view == 'day' || this.state.view == 'day') && jQuery(view.etemplates[0].DOMContainer).is(':visible'))
{
if(state.state.view == 'day' && state.state.owner.length === 1 && !isNaN(state.state.owner) && state.state.owner[0] >= 0 && !egwIsMobile())
if(state.state.view == 'day' && state.state.owner.length === 1 && !isNaN(state.state.owner) && state.state.owner[0] >= 0 && !egwIsMobile()
// Check preferences and permissions
&& egw.user('apps')['infolog'] && egw.preference('cal_show','infolog') !== '0'
)
{
// Set width to 70%, otherwise if a scrollbar is needed for the view, it will conflict with the todo list
jQuery((<etemplate2>CalendarApp.views.day.etemplates[0]).DOMContainer).css("width","70%");