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

Remove nextmatch export button

Browse Source
This commit is contained in:
Nathan Gray 2014-03-06 22:30:44 +00:00
parent 8b9f806b1f
commit 7ad4ebfdea
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addressbook/inc/class.addressbook_ui.inc.php
View File

@ -232,10 +232,6 @@ class addressbook_ui extends addressbook_bo
'favorites' => true, 'favorites' => true,
'placeholder_actions' => array('add') 'placeholder_actions' => array('add')
); );
$csv_export = new addressbook_csv($this);
$content['nm']['csv_fields'] = $GLOBALS['egw_info']['user']['preferences']['addressbook']['nextmatch-export-definition'] ?
$GLOBALS['egw_info']['user']['preferences']['addressbook']['nextmatch-export-definition'] :
$csv_export->csv_fields(null,true);
if ($do_email) if ($do_email)
{ {

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

@ -287,10 +287,6 @@ class infolog_ui
//echo "<p>infolog_ui.get_rows(start=$query[start],search='$query[search]',filter='$query[filter]',cat_id=$query[cat_id],action='$query[action]/$query[action_id]',col_filter=".print_r($query['col_filter'],True).",sort=$query[sort],order=$query[order])</p>\n"; //echo "<p>infolog_ui.get_rows(start=$query[start],search='$query[search]',filter='$query[filter]',cat_id=$query[cat_id],action='$query[action]/$query[action_id]',col_filter=".print_r($query['col_filter'],True).",sort=$query[sort],order=$query[order])</p>\n";
if (!isset($query['start'])) $query['start'] = 0; if (!isset($query['start'])) $query['start'] = 0;
if ($query['csv_export'] && $query['csv_export'] === true)
{
$query['csv_fields'] = $this->csv_export_fields($query['col_filter']['info_type']);
}
// handle linked filter (show only entries linked to a certain other entry) // handle linked filter (show only entries linked to a certain other entry)
if ($query['col_filter']['linked']) if ($query['col_filter']['linked'])
{ {
@ -860,7 +856,6 @@ class infolog_ui
$values['action_title'] = $persist['action_title'] = $values['nm']['action_title'] = $action_title; $values['action_title'] = $persist['action_title'] = $values['nm']['action_title'] = $action_title;
$persist['called_as'] = $called_as; $persist['called_as'] = $called_as;
$persist['own_referer'] = $own_referer; $persist['own_referer'] = $own_referer;
$values['nm']['csv_fields'] = true; // get set in get_rows to not include all custom fields
// store whole $values[nm] in etemplate request // store whole $values[nm] in etemplate request
unset($values['nm']['rows']); unset($values['nm']['rows']);