Skip to content
Snippets Groups Projects
Unverified Commit 202f618a authored by Peter Rotich's avatar Peter Rotich Committed by GitHub
Browse files

Merge pull request #8 from aydreeihn/issue/user-ticket-export

Issue: Dumping Tickets From User View
parents ae20ec25 95e4c476
No related branches found
No related tags found
No related merge requests found
...@@ -57,6 +57,10 @@ class Export { ...@@ -57,6 +57,10 @@ class Export {
$fields[$key] = $f; $fields[$key] = $f;
$cdata[$key] = $f->getLocal('label'); $cdata[$key] = $f->getLocal('label');
} }
if (!is_array($target))
$target = CustomQueue::getExportableFields() + $cdata;
// Reset the $sql query // Reset the $sql query
$tickets = $sql->models() $tickets = $sql->models()
->select_related('user', 'user__default_email', 'dept', 'staff', ->select_related('user', 'user__default_email', 'dept', 'staff',
......
...@@ -184,7 +184,7 @@ if ($user ) { ...@@ -184,7 +184,7 @@ if ($user ) {
} elseif ($_REQUEST['a'] == 'export' && ($query=$_SESSION[':U:tickets'])) { } elseif ($_REQUEST['a'] == 'export' && ($query=$_SESSION[':U:tickets'])) {
$filename = sprintf('%s-tickets-%s.csv', $filename = sprintf('%s-tickets-%s.csv',
$user->getName(), strftime('%Y%m%d')); $user->getName(), strftime('%Y%m%d'));
if (!Export::saveTickets($query, $filename, 'csv')) if (!Export::saveTickets($query, '', $filename, 'csv'))
$errors['err'] = __('Unable to dump query results.') $errors['err'] = __('Unable to dump query results.')
.' '.__('Internal error occurred'); .' '.__('Internal error occurred');
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment