From b86efb5c018a95f4d48631123c00fa2e12800c40 Mon Sep 17 00:00:00 2001
From: aydreeihn <adriane@enhancesoft.com>
Date: Thu, 25 Oct 2018 13:07:10 -0500
Subject: [PATCH] Deleting the Default Queue
This commit fixes an issue where Agents were able to delete their default queue which then prevented them from going to any queue upon logging in. Now, they will see an error message if they try to do so.
---
scp/queues.php | 6 ++++--
scp/tickets.php | 31 ++++++++++++++++++-------------
2 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/scp/queues.php b/scp/queues.php
index 997fefa26..37fc13e3e 100644
--- a/scp/queues.php
+++ b/scp/queues.php
@@ -72,11 +72,13 @@ if ($_POST) {
if ($queue->save()) $updated++;
break;
case 'delete':
- if ($queue->delete()) $updated++;
+ if ($queue->getId() == $cfg->getDefaultTicketQueueId())
+ $err = __('This queue is the default queue. Unable to delete. ');
+ elseif ($queue->delete()) $updated++;
}
}
if (!$updated) {
- Messages::error(__(
+ Messages::error($err ?: __(
'Unable to manage any of the selected queues'));
}
elseif ($_POST['count'] && $updated != $_POST['count']) {
diff --git a/scp/tickets.php b/scp/tickets.php
index 86fec81f2..f09184143 100644
--- a/scp/tickets.php
+++ b/scp/tickets.php
@@ -23,6 +23,11 @@ require_once(INCLUDE_DIR.'class.json.php');
require_once(INCLUDE_DIR.'class.dynamic_forms.php');
require_once(INCLUDE_DIR.'class.export.php'); // For paper sizes
+
+
+// Fetch ticket queues organized by root and sub-queues
+$queues = CustomQueue::getHierarchicalQueues($thisstaff);
+
$page='';
$ticket = $user = null; //clean start.
$redirect = false;
@@ -113,18 +118,21 @@ if (!$ticket) {
$queue = AdhocSearch::load($key);
}
- // Make the current queue sticky
- $_SESSION[$queue_key] = $queue_id;
-
- if ((int) $queue_id && !$queue) {
+ if ((int) $queue_id && !$queue)
$queue = SavedQueue::lookup($queue_id);
- }
- if (!$queue) {
- $queue = SavedQueue::lookup($cfg->getDefaultTicketQueueId());
- }
- // Set the queue_id for navigation to turn a top-level item bold
- $_REQUEST['queue'] = $queue->getId();
+ if (!$queue && ($qid=$cfg->getDefaultTicketQueueId()))
+ $queue = SavedQueue::lookup($qid);
+
+ if (!$queue && $queues)
+ list($queue,) = $queues[0];
+
+ if ($queue) {
+ // Set the queue_id for navigation to turn a top-level item bold
+ $_REQUEST['queue'] = $queue->getId();
+ // Make the current queue sticky
+ $_SESSION[$queue_key] = $queue->getId();
+ }
}
// Configure form for file uploads
@@ -450,9 +458,6 @@ if (isset($_GET['clear_filter']))
$nav->setTabActive('tickets');
$nav->addSubNavInfo('jb-overflowmenu', 'customQ_nav');
-// Fetch ticket queues organized by root and sub-queues
-$queues = CustomQueue::getHierarchicalQueues($thisstaff);
-
// Start with all the top-level (container) queues
foreach ($queues as $_) {
list($q, $children) = $_;
--
GitLab