From 6f8e57f61c76be2b60d11fa80efd49eb6626967c Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Wed, 21 Oct 2015 14:06:38 -0500
Subject: [PATCH] queue: Move default queue setting to ticket settings
---
include/staff/queues-ticket.inc.php | 29 --------------------------
include/staff/settings-tickets.inc.php | 17 +++++++++++++++
2 files changed, 17 insertions(+), 29 deletions(-)
diff --git a/include/staff/queues-ticket.inc.php b/include/staff/queues-ticket.inc.php
index ef12f8873..646a3c100 100644
--- a/include/staff/queues-ticket.inc.php
+++ b/include/staff/queues-ticket.inc.php
@@ -1,32 +1,3 @@
-<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::queues() 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 fb5b47750..dd259ea8a 100644
--- a/include/staff/settings-tickets.inc.php
+++ b/include/staff/settings-tickets.inc.php
@@ -164,6 +164,23 @@ if(!($maxfileuploads=ini_get('max_file_uploads')))
<div class="error"><?php echo $errors['ticket_lock']; ?></div>
</td>
</tr>
+ <tr>
+ <td>
+ <?php echo __('Default Ticket Queue'); ?>:
+ </td>
+ <td>
+ <select name="default_ticket_queue">
+<?php foreach (CustomQueue::queues() 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>
<tr>
<td><?php echo __('Maximum <b>Open</b> Tickets');?>:</td>
<td>
--
GitLab