extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 04:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Pre-set contact in new infologs opened from context menu.

Browse Source 
Contact taken from link filter, or current contact when in CRM view.
This commit is contained in:
Nathan Gray 2015-05-11 21:03:29 +00:00
parent 652cec5463
commit d599cadf8a
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
infolog/inc/class.infolog_ui.inc.php
View File

@ -1044,8 +1044,7 @@ class infolog_ui
'icon' => $type, 'icon' => $type,
); );
$types_add[$type] = $data + array( $types_add[$type] = $data + array(
'url' => 'menuaction=infolog.infolog_ui.edit&type='.$type, 'onExecute' => "javaScript:app.infolog.add_action_handler"
'popup' => egw_link::get_registry('infolog', 'add_popup'),
); );
} }

32
infolog/js/app.js
View File

@ -488,6 +488,27 @@ app.classes.infolog = AppJS.extend(
egw.open('','infolog','add'); egw.open('','infolog','add');
}, },
/**
* Wrapper so add -> New actions in the context menu can pass current
* filter values into new edit dialog
*
* @see add_with_extras
*
* @param {egwAction} action
* @param {egwActionObject[]} selected
*/
add_action_handler: function(action, selected)
{
var nm = action.getManager().data.nextmatch || false;
if(nm)
{
this.add_with_extras(nm,action.id,
nm.getArrayMgr('content').getEntry('action'),
nm.getArrayMgr('content').getEntry('action_id')
);
}
},
/** /**
* Opens a new edit dialog with some extra url parameters pulled from * Opens a new edit dialog with some extra url parameters pulled from
* standard locations. Done with a function instead of hardcoding so * standard locations. Done with a function instead of hardcoding so
@ -514,6 +535,17 @@ app.classes.infolog = AppJS.extend(
// Need a real array here // Need a real array here
action_id = jQuery.map(action_id,function(val) {return val;}); action_id = jQuery.map(action_id,function(val) {return val;});
} }
// No action? Try the linked filter, in case it's set
if(!_action && !_action_id)
{
if(nm_value.col_filter && nm_value.col_filter.linked)
{
var split = nm_value.col_filter.linked.split(':') || '';
_action = split[0] || '';
action_id = split[1] || '';
}
}
var extras = { var extras = {
type: _type || nm_value.filter || "", type: _type || nm_value.filter || "",
cat_id: nm_value.cat_id || "", cat_id: nm_value.cat_id || "",