extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 00:54:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add actions (Add) for blank parts of planner view

Browse Source
This commit is contained in:
nathangray 2016-08-22 09:39:09 -06:00
parent 81b78074ce
commit 7abf44c6a3
2 changed files with 68 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/js/egw_action/egw_action_popup.js
View File

@ -848,6 +848,8 @@ function egwPopupActionImplementation()
} }
// Add into links so it's included in menu // Add into links so it's included in menu
if(paste_action && paste_action.enabled.exec())
{
if(typeof _links[paste_action.id] == 'undefined') if(typeof _links[paste_action.id] == 'undefined')
{ {
_links[paste_action.id] = { _links[paste_action.id] = {
@ -897,6 +899,7 @@ function egwPopupActionImplementation()
} }
} }
} }
}
}; };
return ai; return ai;
} }

26
calendar/js/et2_widget_planner.js
View File

@ -1389,7 +1389,7 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
this._init_links_dnd(widget_object.manager, action_links); this._init_links_dnd(widget_object.manager, action_links);
//widget_object.updateActionLinks(action_links); widget_object.updateActionLinks(action_links);
this._actionObject = widget_object; this._actionObject = widget_object;
}, },
@ -1409,6 +1409,14 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
var drop_change_participant = mgr.getActionById('change_participant'); var drop_change_participant = mgr.getActionById('change_participant');
var drop_invite = mgr.getActionById('invite'); var drop_invite = mgr.getActionById('invite');
var drag_action = mgr.getActionById('egw_link_drag'); var drag_action = mgr.getActionById('egw_link_drag');
var paste_action = mgr.getActionById('egw_paste');
// Disable paste action
if(paste_action == null)
{
paste_action = mgr.addAction('popup', 'egw_paste', egw.lang('Paste'), egw.image('editpaste'), function(){},true);
}
paste_action.set_enabled(false);
// Check if this app supports linking // Check if this app supports linking
if(!egw.link_get_registry(this.dataStorePrefix || 'calendar', 'query') || if(!egw.link_get_registry(this.dataStorePrefix || 'calendar', 'query') ||
@ -1583,15 +1591,24 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
_get_action_links: function(actions) _get_action_links: function(actions)
{ {
var action_links = []; var action_links = [];
// TODO: determine which actions are allowed without an action (empty actions)
// Only these actions are allowed without a selection (empty actions)
var empty_actions = ['add'];
for(var i in actions) for(var i in actions)
{ {
var action = actions[i]; var action = actions[i];
if(action.type === 'drop') if(empty_actions.indexOf(action.id) !== -1 || action.type === 'drop')
{ {
action_links.push(typeof action.id !== 'undefined' ? action.id : i); action_links.push(typeof action.id !== 'undefined' ? action.id : i);
} }
} }
// Disable automatic paste action, it doesn't have what is needed to work
action_links.push({
"actionObj": 'egw_paste',
"enabled": false,
"visible": false
});
return action_links; return action_links;
}, },
@ -2129,6 +2146,9 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
*/ */
_mouse_down: function(event) _mouse_down: function(event)
{ {
// Only left mouse button
if(event.which !== 1) return;
// Ignore headers // Ignore headers
if(this.headers.has(event.target).length !== 0) return false; if(this.headers.has(event.target).length !== 0) return false;