diff --git a/include/class.config.php b/include/class.config.php
index bab8ecb7b85f7b4ffeaab1f0b59940ccec0b9033..74954e42c26ff5d593eee30103825c22eba39bb2 100644
--- a/include/class.config.php
+++ b/include/class.config.php
@@ -914,13 +914,16 @@ class OsticketConfig extends Config {
return $this->get('auto_claim_tickets');
}
+ // XXX: Drop these!!
function showAssignedTickets() {
return ($this->get('show_assigned_tickets'));
}
-
function showAnsweredTickets() {
return ($this->get('show_answered_tickets'));
}
+ function getDefaultTicketQueueId() {
+ return $this->get('default_ticket_queue');
+ }
function hideStaffName() {
return ($this->get('hide_staff_name'));
@@ -1238,6 +1241,12 @@ class OsticketConfig extends Config {
if (!preg_match('`(?!<\\\)#`', $vars['ticket_number_format']))
$errors['ticket_number_format'] = 'Ticket number format requires at least one hash character (#)';
+ require_once INCLUDE_DIR . 'class.queue.php';
+ if (!isset($vars['default_ticket_queue']))
+ $errors['default_ticket_queue'] = __("Select a default ticket queue");
+ elseif (!CustomQueue::lookup($vars['default_ticket_queue']))
+ $errors['default_ticket_queue'] = __("Select a default ticket queue");
+
$this->updateAutoresponderSettings($vars, $errors);
$this->updateAlertsSettings($vars, $errors);
@@ -1245,7 +1254,6 @@ class OsticketConfig extends Config {
return false;
// Sort ticket queues
- require_once INCLUDE_DIR . 'class.queue.php';
$queues = CustomQueue::objects()->all();
foreach ($vars['qsort'] as $queue_id => $sort) {
if ($q = $queues->findFirst(array('id' => $queue_id))) {
@@ -1264,11 +1272,10 @@ class OsticketConfig extends Config {
'max_open_tickets'=>$vars['max_open_tickets'],
'enable_captcha'=>isset($vars['enable_captcha'])?1:0,
'auto_claim_tickets'=>isset($vars['auto_claim_tickets'])?1:0,
- 'show_assigned_tickets'=>isset($vars['show_assigned_tickets'])?0:1,
- 'show_answered_tickets'=>isset($vars['show_answered_tickets'])?0:1,
'show_related_tickets'=>isset($vars['show_related_tickets'])?1:0,
'allow_client_updates'=>isset($vars['allow_client_updates'])?1:0,
'ticket_lock' => $vars['ticket_lock'],
+ 'default_ticket_queue'=>$vars['default_ticket_queue'],
));
}
diff --git a/include/staff/queues-ticket.inc.php b/include/staff/queues-ticket.inc.php
index 33cb32a2a308ef5bb6621d7745a5e728fe60ddaf..74ff8662c42812b9c39e74c9878c51a3a2676b85 100644
--- a/include/staff/queues-ticket.inc.php
+++ b/include/staff/queues-ticket.inc.php
@@ -1,6 +1,35 @@
<?php
require_once INCLUDE_DIR . 'class.queue.php';
?>
+<div>
+<table class="form_table settings_table" width="940" border="0" cellspacing="0" cellpadding="2">
+ <thead>
+ <tr>
+ <th colspan="2">
+ <em><?php echo __('System-wide default ticket queues settings and options.'); ?></em>
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>
+ <?php echo __('Default Ticket Queue'); ?>:
+ </td>
+ <td>
+ <select name="default_ticket_queue">
+<?php foreach (CustomQueue::objects() as $cq) {
+?>
+ <option value="<?php echo $cq->id; ?>"
+ <?php if ($cq->getId() == $config['default_ticket_queue']) echo 'selected="selected"'; ?>
+ ><?php echo $cq->getFullName(); ?></option>
+<?php } ?>
+ </select>
+ <i class="help-tip icon-question-sign" href="#default_ticket_queue"></i>
+ <div class="error"><?php echo $errors['default_ticket_queue']; ?></div>
+ </td>
+ </tr>
+</div>
+
<div>
<div class="pull-right">
<a href="queues.php?t=tickets&a=add" class="green button action-button"><i class="icon-plus-sign"></i> <?php echo __('Add New Queue');?></a>
diff --git a/include/staff/settings-tickets.inc.php b/include/staff/settings-tickets.inc.php
index 454b53f64f331f4597120a61824d62dfe65b978b..fb5b47750dd3b56e4deac3695e7c3f5365c0395a 100644
--- a/include/staff/settings-tickets.inc.php
+++ b/include/staff/settings-tickets.inc.php
@@ -189,24 +189,6 @@ if(!($maxfileuploads=ini_get('max_file_uploads')))
<?php echo __('Enable'); ?> <i class="help-tip icon-question-sign" href="#claim_tickets"></i>
</td>
</tr>
- <tr>
- <td><?php echo __('Assigned Tickets');?>:</td>
- <td>
- <input type="checkbox" name="show_assigned_tickets" <?php
- echo !$config['show_assigned_tickets']?'checked="checked"':''; ?>>
- <?php echo __('Exclude assigned tickets from open queue.'); ?>
- <i class="help-tip icon-question-sign" href="#assigned_tickets"></i>
- </td>
- </tr>
- <tr>
- <td><?php echo __('Answered Tickets');?>:</td>
- <td>
- <input type="checkbox" name="show_answered_tickets" <?php
- echo !$config['show_answered_tickets']?'checked="checked"':''; ?>>
- <?php echo __('Exclude answered tickets from open queue.'); ?>
- <i class="help-tip icon-question-sign" href="#answered_tickets"></i>
- </td>
- </tr>
<tr>
<th colspan="2">
<em><b><?php echo __('Attachments');?></b>: <?php echo __('Size and maximum uploads setting mainly apply to web tickets.');?></em>
diff --git a/include/staff/tickets.inc.php b/include/staff/tickets.inc.php
deleted file mode 100644
index 15881dce53da050a89bc66d7d40cea206d7d5452..0000000000000000000000000000000000000000
--- a/include/staff/tickets.inc.php
+++ /dev/null
@@ -1,660 +0,0 @@
-<?php
-$search = SavedSearch::create();
-$tickets = TicketModel::objects();
-$clear_button = false;
-$view_all_tickets = $date_header = $date_col = false;
-
-// Make sure the cdata materialized view is available
-TicketForm::ensureDynamicDataView();
-
-// Figure out REFRESH url — which might not be accurate after posting a
-// response
-list($path,) = explode('?', $_SERVER['REQUEST_URI'], 2);
-$args = array();
-parse_str($_SERVER['QUERY_STRING'], $args);
-
-// Remove commands from query
-unset($args['id']);
-if ($args['a'] !== 'search') unset($args['a']);
-
-$refresh_url = $path . '?' . http_build_query($args);
-
-$sort_options = array(
- 'priority,updated' => __('Priority + Most Recently Updated'),
- 'updated' => __('Most Recently Updated'),
- 'priority,created' => __('Priority + Most Recently Created'),
- 'due' => __('Due Date'),
- 'priority,due' => __('Priority + Due Date'),
- 'number' => __('Ticket Number'),
- 'answered' => __('Most Recently Answered'),
- 'closed' => __('Most Recently Closed'),
- 'hot' => __('Longest Thread'),
- 'relevance' => __('Relevance'),
-);
-
-// Queues columns
-
-$queue_columns = array(
- 'number' => array(
- 'width' => '7.4%',
- 'heading' => __('Number'),
- ),
- 'date' => array(
- 'width' => '14.6%',
- 'heading' => __('Date Created'),
- 'sort_col' => 'created',
- ),
- 'subject' => array(
- 'width' => '29.8%',
- 'heading' => __('Subject'),
- 'sort_col' => 'cdata__subject',
- ),
- 'name' => array(
- 'width' => '18.1%',
- 'heading' => __('From'),
- 'sort_col' => 'user__name',
- ),
- 'status' => array(
- 'width' => '8.4%',
- 'heading' => __('Status'),
- 'sort_col' => 'status_id',
- ),
- 'priority' => array(
- 'width' => '8.4%',
- 'heading' => __('Priority'),
- 'sort_col' => 'cdata__:priority__priority_urgency',
- ),
- 'assignee' => array(
- 'width' => '16%',
- 'heading' => __('Agent'),
- ),
- 'dept' => array(
- 'width' => '16%',
- 'heading' => __('Department'),
- 'sort_col' => 'dept__name',
- ),
- );
-
-$use_subquery = true;
-
-// Figure out the queue we're viewing
-$queue_key = sprintf('::Q:%s', ObjectModel::OBJECT_TYPE_TICKET);
-$queue_name = $_SESSION[$queue_key] ?: '';
-
-switch ($queue_name) {
-case 'closed':
- $status='closed';
- $results_type=__('Closed Tickets');
- $showassigned=true; //closed by.
- $queue_sort_options = array('closed', 'priority,due', 'due',
- 'priority,updated', 'priority,created', 'answered', 'number', 'hot');
- break;
-case 'overdue':
- $status='open';
- $results_type=__('Overdue Tickets');
- $tickets->filter(array('isoverdue'=>1));
- $queue_sort_options = array('priority,due', 'due', 'priority,updated',
- 'updated', 'answered', 'priority,created', 'number', 'hot');
- break;
-case 'assigned':
- $status='open';
- $staffId=$thisstaff->getId();
- $results_type=__('My Tickets');
- $tickets->filter(Q::any(array(
- 'staff_id'=>$thisstaff->getId(),
- Q::all(array('staff_id' => 0, 'team_id__gt' => 0)),
- )));
- $queue_sort_options = array('updated', 'priority,updated',
- 'priority,created', 'priority,due', 'due', 'answered', 'number',
- 'hot');
- break;
-case 'answered':
- $status='open';
- $showanswered=true;
- $results_type=__('Answered Tickets');
- $tickets->filter(array('isanswered'=>1));
- $queue_sort_options = array('answered', 'priority,updated', 'updated',
- 'priority,created', 'priority,due', 'due', 'number', 'hot');
- break;
-default:
-case 'search':
- $queue_sort_options = array('priority,updated', 'priority,created',
- 'priority,due', 'due', 'updated', 'answered',
- 'closed', 'number', 'hot');
- // Consider basic search
- if ($_REQUEST['query']) {
- $results_type=__('Search Results');
- // Use an index if possible
- if ($_REQUEST['search-type'] == 'typeahead') {
- if (Validator::is_email($_REQUEST['query'])) {
- $tickets = $tickets->filter(array(
- 'user__emails__address' => $_REQUEST['query'],
- ));
- }
- elseif ($_REQUEST['query']) {
- $tickets = $tickets->filter(array(
- 'number' => $_REQUEST['query'],
- ));
- }
- }
- elseif (isset($_REQUEST['query'])
- && ($q = trim($_REQUEST['query']))
- && strlen($q) > 2
- ) {
- // [Search] click, consider keywords
- $__tickets = $ost->searcher->find($q, $tickets);
- if (!count($__tickets) && preg_match('`\w$`u', $q)) {
- // Do wildcard search if no hits
- $__tickets = $ost->searcher->find($q.'*', $tickets);
- }
- $tickets = $__tickets;
- $has_relevance = true;
- }
- // Clear sticky search queue
- unset($_SESSION[$queue_key]);
- break;
- }
- // Apply user filter
- elseif (isset($_GET['uid']) && ($user = User::lookup($_GET['uid']))) {
- $tickets->filter(array('user__id'=>$_GET['uid']));
- $results_type = sprintf('%s — %s', __('Search Results'),
- $user->getName());
- if (isset($_GET['status']))
- $status = $_GET['status'];
- // Don't apply normal open ticket
- break;
- }
- elseif (isset($_GET['orgid']) && ($org = Organization::lookup($_GET['orgid']))) {
- $tickets->filter(array('user__org_id'=>$_GET['orgid']));
- $results_type = sprintf('%s — %s', __('Search Results'),
- $org->getName());
- if (isset($_GET['status']))
- $status = $_GET['status'];
- // Don't apply normal open ticket
- break;
- } elseif (isset($_SESSION['advsearch'])) {
- $form = $search->getFormFromSession('advsearch');
- $tickets = $search->mangleQuerySet($tickets, $form);
- $view_all_tickets = $thisstaff->hasPerm(SearchBackend::PERM_EVERYTHING);
- $results_type=__('Advanced Search')
- . '<a class="action-button" style="font-size: 15px;" href="?clear_filter"><i style="top:0" class="icon-ban-circle"></i> <em>' . __('clear') . '</em></a>';
- foreach ($form->getFields() as $sf) {
- if ($sf->get('name') == 'keywords' && $sf->getClean()) {
- $has_relevance = true;
- break;
- }
- }
- break;
- }
- // Fall-through and show open tickets
-case 'open':
- $status='open';
- $queue_name = $queue_name ?: 'open';
- $results_type=__('Open Tickets');
- if (!$cfg->showAnsweredTickets())
- $tickets->filter(array('isanswered'=>0));
- $queue_sort_options = array('priority,updated', 'updated',
- 'priority,due', 'due', 'priority,created', 'answered', 'number',
- 'hot');
- break;
-}
-
-// Open queues _except_ assigned should respect showAssignedTickets()
-// settings
-if ($status != 'closed' && $queue_name != 'assigned') {
- $hideassigned = ($cfg && !$cfg->showAssignedTickets()) && !$thisstaff->showAssignedTickets();
- $showassigned = !$hideassigned;
- if ($queue_name == 'open' && $hideassigned)
- $tickets->filter(array('staff_id'=>0, 'team_id'=>0));
-}
-
-// Apply primary ticket status
-if ($status)
- $tickets->filter(array('status__state'=>$status));
-
-// Impose visibility constraints
-// ------------------------------------------------------------
-if (!$view_all_tickets) {
- // -- Open and assigned to me
- $assigned = Q::any(array(
- 'staff_id' => $thisstaff->getId(),
- ));
- // -- Open and assigned to a team of mine
- if ($teams = array_filter($thisstaff->getTeams()))
- $assigned->add(array('team_id__in' => $teams));
-
- $visibility = Q::any(new Q(array('status__state'=>'open', $assigned)));
-
- // -- Routed to a department of mine
- if (!$thisstaff->showAssignedOnly() && ($depts=$thisstaff->getDepts()))
- $visibility->add(array('dept_id__in' => $depts));
-
- $tickets->filter($visibility);
-}
-
-// TODO :: Apply requested quick filter
-
-// Apply requested pagination
-$page=($_GET['p'] && is_numeric($_GET['p']))?$_GET['p']:1;
-$count = $tickets->count();
-$pageNav = new Pagenate($count, $page, PAGE_LIMIT);
-$pageNav->setURL('tickets.php', $args);
-$tickets = $pageNav->paginate($tickets);
-
-// Apply requested sorting
-$queue_sort_key = sprintf(':Q%s:%s:sort', ObjectModel::OBJECT_TYPE_TICKET, $queue_name);
-
-// If relevance is available, use it as the default
-if ($has_relevance) {
- array_unshift($queue_sort_options, 'relevance');
-}
-elseif ($_SESSION[$queue_sort_key][0] == 'relevance') {
- unset($_SESSION[$queue_sort_key]);
-}
-
-if (isset($_GET['sort'])) {
- $_SESSION[$queue_sort_key] = array($_GET['sort'], $_GET['dir']);
-}
-elseif (!isset($_SESSION[$queue_sort_key])) {
- $_SESSION[$queue_sort_key] = array($queue_sort_options[0], 0);
-}
-
-list($sort_cols, $sort_dir) = $_SESSION[$queue_sort_key];
-$orm_dir = $sort_dir ? QuerySet::ASC : QuerySet::DESC;
-$orm_dir_r = $sort_dir ? QuerySet::DESC : QuerySet::ASC;
-
-switch ($sort_cols) {
-case 'number':
- $queue_columns['number']['sort_dir'] = $sort_dir;
- $tickets->extra(array(
- 'order_by'=>array(
- array(SqlExpression::times(new SqlField('number'), 1), $orm_dir)
- )
- ));
- break;
-
-case 'priority,created':
- $tickets->order_by(($sort_dir ? '-' : '') . 'cdata__:priority__priority_urgency');
- // Fall through to columns for `created`
-case 'created':
- $queue_columns['date']['heading'] = __('Date Created');
- $queue_columns['date']['sort_col'] = $date_col = 'created';
- $tickets->values('created');
- $tickets->order_by($sort_dir ? 'created' : '-created');
- break;
-
-case 'priority,due':
- $tickets->order_by('cdata__:priority__priority_urgency', $orm_dir_r);
- // Fall through to add in due date filter
-case 'due':
- $queue_columns['date']['heading'] = __('Due Date');
- $queue_columns['date']['sort'] = 'due';
- $queue_columns['date']['sort_col'] = $date_col = 'est_duedate';
- $tickets->values('est_duedate');
- $tickets->order_by(SqlFunction::COALESCE(new SqlField('est_duedate'), 'zzz'), $orm_dir_r);
- break;
-
-case 'closed':
- $queue_columns['date']['heading'] = __('Date Closed');
- $queue_columns['date']['sort'] = $sort_cols;
- $queue_columns['date']['sort_col'] = $date_col = 'closed';
- $queue_columns['date']['sort_dir'] = $sort_dir;
- $tickets->values('closed');
- $tickets->order_by('closed', $orm_dir);
- break;
-
-case 'answered':
- $queue_columns['date']['heading'] = __('Last Response');
- $queue_columns['date']['sort'] = $sort_cols;
- $queue_columns['date']['sort_col'] = $date_col = 'thread__lastresponse';
- $queue_columns['date']['sort_dir'] = $sort_dir;
- $date_fallback = '<em class="faded">'.__('unanswered').'</em>';
- $tickets->order_by('thread__lastresponse', $orm_dir);
- $tickets->values('thread__lastresponse');
- break;
-
-case 'hot':
- $tickets->order_by('thread_count', $orm_dir);
- $tickets->annotate(array(
- 'thread_count' => SqlAggregate::COUNT('thread__entries'),
- ));
- break;
-
-case 'relevance':
- $tickets->order_by(new SqlCode('__relevance__'), $orm_dir);
- break;
-
-case 'assignee':
- $tickets->order_by('staff__lastname', $orm_dir);
- $tickets->order_by('staff__firstname', $orm_dir);
- $tickets->order_by('team__name', $orm_dir);
- $queue_columns['assignee']['sort_dir'] = $sort_dir;
- break;
-
-default:
- if ($sort_cols && isset($queue_columns[$sort_cols])) {
- $queue_columns[$sort_cols]['sort_dir'] = $sort_dir;
- if (isset($queue_columns[$sort_cols]['sort_col']))
- $sort_cols = $queue_columns[$sort_cols]['sort_col'];
- $tickets->order_by($sort_cols, $orm_dir);
- break;
- }
-
-case 'priority,updated':
- $tickets->order_by('cdata__:priority__priority_urgency', $orm_dir_r);
- // Fall through for columns defined for `updated`
-case 'updated':
- $queue_columns['date']['heading'] = __('Last Updated');
- $queue_columns['date']['sort'] = $sort_cols;
- $queue_columns['date']['sort_col'] = $date_col = 'lastupdate';
- $tickets->order_by('lastupdate', $orm_dir);
- break;
-}
-
-if (in_array($sort_cols, array('created', 'due', 'updated')))
- $queue_columns['date']['sort_dir'] = $sort_dir;
-
-// Rewrite $tickets to use a nested query, which will include the LIMIT part
-// in order to speed the result
-$orig_tickets = clone $tickets;
-$tickets2 = TicketModel::objects();
-$tickets2->values = $tickets->values;
-$tickets2->filter(array('ticket_id__in' => $tickets->values_flat('ticket_id')));
-
-// Transfer the order_by from the original tickets
-$tickets2->order_by($orig_tickets->getSortFields());
-$tickets = $tickets2;
-
-// Save the query to the session for exporting
-$_SESSION[':Q:tickets'] = $tickets;
-
-TicketForm::ensureDynamicDataView();
-
-// Select pertinent columns
-// ------------------------------------------------------------
-$tickets->values('lock__staff_id', 'staff_id', 'isoverdue', 'team_id',
-'ticket_id', 'number', 'cdata__subject', 'user__default_email__address',
-'source', 'cdata__:priority__priority_color', 'cdata__:priority__priority_desc', 'status_id', 'status__name', 'status__state', 'dept_id', 'dept__name', 'user__name', 'lastupdate', 'isanswered', 'staff__firstname', 'staff__lastname', 'team__name');
-
-// Add in annotations
-$tickets->annotate(array(
- 'collab_count' => TicketThread::objects()
- ->filter(array('ticket__ticket_id' => new SqlField('ticket_id', 1)))
- ->aggregate(array('count' => SqlAggregate::COUNT('collaborators__id'))),
- 'attachment_count' => TicketThread::objects()
- ->filter(array('ticket__ticket_id' => new SqlField('ticket_id', 1)))
- ->filter(array('entries__attachments__inline' => 0))
- ->aggregate(array('count' => SqlAggregate::COUNT('entries__attachments__id'))),
- 'thread_count' => TicketThread::objects()
- ->filter(array('ticket__ticket_id' => new SqlField('ticket_id', 1)))
- ->exclude(array('entries__flags__hasbit' => ThreadEntry::FLAG_HIDDEN))
- ->aggregate(array('count' => SqlAggregate::COUNT('entries__id'))),
-));
-
-
-// Make sure we're only getting active locks
-$tickets->constrain(array('lock' => array(
- 'lock__expire__gt' => SqlFunction::NOW())));
-
-?>
-
-<!-- SEARCH FORM START -->
-<div id='basic_search'>
- <div class="pull-right" style="height:25px">
- <span class="valign-helper"></span>
- <?php
- require STAFFINC_DIR.'templates/queue-sort.tmpl.php';
- ?>
- </div>
- <form action="tickets.php" method="get" onsubmit="javascript:
- $.pjax({
- url:$(this).attr('action') + '?' + $(this).serialize(),
- container:'#pjax-container',
- timeout: 2000
- });
-return false;">
- <input type="hidden" name="a" value="search">
- <input type="hidden" name="search-type" value=""/>
- <div class="attached input">
- <input type="text" class="basic-search" data-url="ajax.php/tickets/lookup" name="query"
- autofocus size="30" value="<?php echo Format::htmlchars($_REQUEST['query'], true); ?>"
- autocomplete="off" autocorrect="off" autocapitalize="off">
- <button type="submit" class="attached button"><i class="icon-search"></i>
- </button>
- </div>
- <a href="#" onclick="javascript:
- $.dialog('ajax.php/tickets/search', 201);"
- >[<?php echo __('advanced'); ?>]</a>
- <i class="help-tip icon-question-sign" href="#advanced"></i>
- </form>
-</div>
-<!-- SEARCH FORM END -->
-<div class="clear"></div>
-<div style="margin-bottom:20px; padding-top:5px;">
- <div class="sticky bar opaque">
- <div class="content">
- <div class="pull-left flush-left">
- <h2><a href="<?php echo $refresh_url; ?>"
- title="<?php echo __('Refresh'); ?>"><i class="icon-refresh"></i> <?php echo
- $results_type; ?></a></h2>
- </div>
- <div class="pull-right flush-right">
- <?php
- if ($count) {
- Ticket::agentActions($thisstaff, array('status' => $status));
- }?>
- </div>
- </div>
- </div>
-</div>
-<div class="clear"></div>
-<form action="tickets.php" method="POST" name='tickets' id="tickets">
-<?php csrf_token(); ?>
- <input type="hidden" name="a" value="mass_process" >
- <input type="hidden" name="do" id="action" value="" >
- <input type="hidden" name="status" value="<?php echo
- Format::htmlchars($_REQUEST['status'], true); ?>" >
- <table class="list" border="0" cellspacing="1" cellpadding="2" width="940">
- <thead>
- <tr>
- <?php
- if ($thisstaff->canManageTickets()) { ?>
- <th width="2%"> </th>
- <?php } ?>
-
- <?php
- // Swap some columns based on the queue.
- if ($showassigned ) {
- unset($queue_columns['dept']);
- if (!strcasecmp($status,'closed'))
- $queue_columns['assignee']['heading'] = __('Closed By');
- else
- $queue_columns['assignee']['heading'] = __('Assigned To');
- } else {
- unset($queue_columns['assignee']);
- }
- if ($search && !$status)
- unset($queue_columns['priority']);
- else
- unset($queue_columns['status']);
-
- // Query string
- unset($args['sort'], $args['dir'], $args['_pjax']);
- $qstr = Http::build_query($args);
- // Show headers
- foreach ($queue_columns as $k => $column) {
- echo sprintf( '<th width="%s"><a href="?sort=%s&dir=%s&%s"
- class="%s">%s</a></th>',
- $column['width'],
- $column['sort'] ?: $k,
- $column['sort_dir'] ? 0 : 1,
- $qstr,
- isset($column['sort_dir'])
- ? ($column['sort_dir'] ? 'asc': 'desc') : '',
- $column['heading']);
- }
- ?>
- </tr>
- </thead>
- <tbody>
- <?php
- // Setup Subject field for display
- $subject_field = TicketForm::getInstance()->getField('subject');
- $class = "row1";
- $total=0;
- $ids=($errors && $_POST['tids'] && is_array($_POST['tids']))?$_POST['tids']:null;
- foreach ($tickets as $T) {
- $total += 1;
- $tag=$T['staff_id']?'assigned':'openticket';
- $flag=null;
- if($T['lock__staff_id'] && $T['lock__staff_id'] != $thisstaff->getId())
- $flag='locked';
- elseif($T['isoverdue'])
- $flag='overdue';
-
- $lc='';
- if ($showassigned) {
- if ($T['staff_id'])
- $lc = new AgentsName($T['staff__firstname'].' '.$T['staff__lastname']);
- elseif ($T['team_id'])
- $lc = Team::getLocalById($T['team_id'], 'name', $T['team__name']);
- }
- else {
- $lc = Dept::getLocalById($T['dept_id'], 'name', $T['dept__name']);
- }
- $tid=$T['number'];
- $subject = $subject_field->display($subject_field->to_php($T['cdata__subject']));
- $threadcount=$T['thread_count'];
- if(!strcasecmp($T['status__state'],'open') && !$T['isanswered'] && !$T['lock__staff_id']) {
- $tid=sprintf('<b>%s</b>',$tid);
- }
- ?>
- <tr id="<?php echo $T['ticket_id']; ?>">
- <?php if($thisstaff->canManageTickets()) {
-
- $sel=false;
- if($ids && in_array($T['ticket_id'], $ids))
- $sel=true;
- ?>
- <td align="center" class="nohover">
- <input class="ckb" type="checkbox" name="tids[]"
- value="<?php echo $T['ticket_id']; ?>" <?php echo $sel?'checked="checked"':''; ?>>
- </td>
- <?php } ?>
- <td title="<?php echo $T['user__default_email__address']; ?>" nowrap>
- <a class="Icon <?php echo strtolower($T['source']); ?>Ticket preview"
- title="Preview Ticket"
- href="tickets.php?id=<?php echo $T['ticket_id']; ?>"
- data-preview="#tickets/<?php echo $T['ticket_id']; ?>/preview"
- ><?php echo $tid; ?></a></td>
- <td align="center" nowrap><?php echo Format::datetime($T[$date_col ?: 'lastupdate']) ?: $date_fallback; ?></td>
- <td><div style="max-width: <?php
- $base = 279;
- // Make room for the paperclip and some extra
- if ($T['attachment_count']) $base -= 18;
- // Assume about 8px per digit character
- if ($threadcount > 1) $base -= 20 + ((int) log($threadcount, 10) + 1) * 8;
- // Make room for overdue flag and friends
- if ($flag) $base -= 20;
- echo $base; ?>px; max-height: 1.2em"
- class="<?php if ($flag) { ?>Icon <?php echo $flag; ?>Ticket <?php } ?>link truncate"
- <?php if ($flag) { ?> title="<?php echo ucfirst($flag); ?> Ticket" <?php } ?>
- href="tickets.php?id=<?php echo $T['ticket_id']; ?>"><?php echo $subject; ?></div>
-<?php if ($T['attachment_count'])
- echo '<i class="small icon-paperclip icon-flip-horizontal" data-toggle="tooltip" title="'
- .$T['attachment_count'].'"></i>';
- if ($threadcount > 1) { ?>
- <span class="pull-right faded-more"><i class="icon-comments-alt"></i>
- <small><?php echo $threadcount; ?></small>
- </span>
- <?php } ?>
- </td>
- <td nowrap><div><?php
- if ($T['collab_count'])
- echo '<span class="pull-right faded-more" data-toggle="tooltip" title="'
- .$T['collab_count'].'"><i class="icon-group"></i></span>';
- ?><span class="truncate" style="max-width:<?php
- echo $T['collab_count'] ? '150px' : '170px'; ?>"><?php
- $un = new UsersName($T['user__name']);
- echo Format::htmlchars($un);
- ?></span></div></td>
- <?php
- if($search && !$status){
- $displaystatus=TicketStatus::getLocalById($T['status_id'], 'value', $T['status__name']);
- if(!strcasecmp($T['status__state'],'open'))
- $displaystatus="<b>$displaystatus</b>";
- echo "<td>$displaystatus</td>";
- } else { ?>
- <td class="nohover" align="center"
- style="background-color:<?php echo $T['cdata__:priority__priority_color']; ?>;">
- <?php echo $T['cdata__:priority__priority_desc']; ?></td>
- <?php
- }
- ?>
- <td nowrap><span class="truncate" style="max-width: 169px"><?php
- echo Format::htmlchars($lc); ?></span></td>
- </tr>
- <?php
- } //end of foreach
- if (!$total)
- $ferror=__('There are no tickets matching your criteria.');
- ?>
- </tbody>
- <tfoot>
- <tr>
- <td colspan="7">
- <?php if($total && $thisstaff->canManageTickets()){ ?>
- <?php echo __('Select');?>:
- <a id="selectAll" href="#ckb"><?php echo __('All');?></a>
- <a id="selectNone" href="#ckb"><?php echo __('None');?></a>
- <a id="selectToggle" href="#ckb"><?php echo __('Toggle');?></a>
- <?php }else{
- echo '<i>';
- echo $ferror?Format::htmlchars($ferror):__('Query returned 0 results.');
- echo '</i>';
- } ?>
- </td>
- </tr>
- </tfoot>
- </table>
- <?php
- if ($total>0) { //if we actually had any tickets returned.
-?> <div>
- <span class="faded pull-right"><?php echo $pageNav->showing(); ?></span>
-<?php
- echo __('Page').':'.$pageNav->getPageLinks().' ';
- echo sprintf('<a class="export-csv no-pjax" href="?%s">%s</a>',
- Http::build_query(array(
- 'a' => 'export', 'h' => $hash,
- 'status' => $_REQUEST['status'])),
- __('Export'));
- echo ' <i class="help-tip icon-question-sign" href="#export"></i></div>';
- } ?>
- </form>
-</div>
-
-<div style="display:none;" class="dialog" id="confirm-action">
- <h3><?php echo __('Please Confirm');?></h3>
- <a class="close" href=""><i class="icon-remove-circle"></i></a>
- <hr/>
- <p class="confirm-action" style="display:none;" id="mark_overdue-confirm">
- <?php echo __('Are you sure you want to flag the selected tickets as <font color="red"><b>overdue</b></font>?');?>
- </p>
- <div><?php echo __('Please confirm to continue.');?></div>
- <hr style="margin-top:1em"/>
- <p class="full-width">
- <span class="buttons pull-left">
- <input type="button" value="<?php echo __('No, Cancel');?>" class="close">
- </span>
- <span class="buttons pull-right">
- <input type="button" value="<?php echo __('Yes, Do it!');?>" class="confirm">
- </span>
- </p>
- <div class="clear"></div>
-</div>
-<script type="text/javascript">
-$(function() {
- $('[data-toggle=tooltip]').tooltip();
-});
-</script>
-
diff --git a/scp/tickets.php b/scp/tickets.php
index d367ac6ecfd1b99159ce4ef2acb2b447d28fcdda..5d7db9168ea226fd793458c9dedb0e3a2c44803f 100644
--- a/scp/tickets.php
+++ b/scp/tickets.php
@@ -59,9 +59,8 @@ if (!$ticket) {
}
require_once INCLUDE_DIR . 'class.queue.php';
-if (isset($_REQUEST['queue'])) {
- $queue = CustomQueue::lookup($_REQUEST['queue']);
-}
+$queue_id = @$_REQUEST['queue'] ?: $cfg->getDefaultTicketQueueId();
+$queue = CustomQueue::lookup($queue_id);
// Configure form for file uploads
$response_form = new SimpleForm(array(
@@ -438,7 +437,7 @@ if($ticket) {
$errors['err'] = __('Unable to export the ticket to PDF for print.')
.' '.__('Internal error occurred');
} else {
- $inc = 'tickets.inc.php';
+ $inc = 'templates/queue-tickets.tmpl.php';
if ($_REQUEST['a']=='open' &&
$thisstaff->hasPerm(TicketModel::PERM_CREATE, false))
$inc = 'ticket-open.inc.php';
@@ -446,7 +445,6 @@ if($ticket) {
$ts = strftime('%Y%m%d');
if (isset($queue) && $queue) {
// XXX: Check staff access?
- $inc = 'templates/queue-tickets.tmpl.php';
if (!($query = $queue->getBasicQuery()))
$errors['err'] = __('Query token not found');
elseif (!Export::saveTickets($query, "tickets-$ts.csv", 'csv'))
@@ -454,9 +452,8 @@ if($ticket) {
.' '.__('Internal error occurred');
}
}
- elseif (isset($queue) && $queue) {
+ elseif ($queue) {
// XXX: Check staff access?
- $inc = 'templates/queue-tickets.tmpl.php';
$quick_filter = @$_REQUEST['filter'];
$tickets = $queue->getQuery(false, $quick_filter);
}