From be401894b7a8c0a3d1bea107f976df7c597c4ed8 Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@osticket.com>
Date: Tue, 14 Jul 2015 04:53:52 +0000
Subject: [PATCH] Don't show action buttons when the queue is empty
---
include/staff/tasks.inc.php | 6 ++++--
include/staff/ticket-tasks.inc.php | 3 ++-
include/staff/tickets.inc.php | 23 +++++++++++++----------
3 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/include/staff/tasks.inc.php b/include/staff/tasks.inc.php
index d908312bd..49cdd5e22 100644
--- a/include/staff/tasks.inc.php
+++ b/include/staff/tasks.inc.php
@@ -168,7 +168,8 @@ default:
// Apply requested pagination
$page=($_GET['p'] && is_numeric($_GET['p']))?$_GET['p']:1;
-$pageNav=new Pagenate($tasks->count(), $page, PAGE_LIMIT);
+$count = $tasks->count();
+$pageNav=new Pagenate($count, $page, PAGE_LIMIT);
$pageNav->setURL('tasks.php', $args);
$tasks = $pageNav->paginate($tasks);
@@ -262,7 +263,8 @@ return false;">
</div>
<div class="pull-right flush-right">
<?php
- Task::getAgentActions($thisstaff, array('status' => $status));
+ if ($count)
+ echo Task::getAgentActions($thisstaff, array('status' => $status));
?>
</div>
</div>
diff --git a/include/staff/ticket-tasks.inc.php b/include/staff/ticket-tasks.inc.php
index 9085ab239..7c2ece1ad 100644
--- a/include/staff/ticket-tasks.inc.php
+++ b/include/staff/ticket-tasks.inc.php
@@ -40,7 +40,8 @@ $showing = $pageNav->showing().' '._N('task', 'tasks', $count);
print __('Add New Task'); ?></a>
<?php
}
- Task::getAgentActions($thisstaff, array('morelabel' => __('Options')));
+ if ($count)
+ Task::getAgentActions($thisstaff, array('morelabel' => __('Options')));
?>
</div>
<div class="clear"></div>
diff --git a/include/staff/tickets.inc.php b/include/staff/tickets.inc.php
index 270f1e287..73554b33a 100644
--- a/include/staff/tickets.inc.php
+++ b/include/staff/tickets.inc.php
@@ -187,7 +187,8 @@ if (!$view_all_tickets) {
// Apply requested pagination
$page=($_GET['p'] && is_numeric($_GET['p']))?$_GET['p']:1;
-$pageNav = new Pagenate($tickets->count(), $page, PAGE_LIMIT);
+$count = $tickets->count();
+$pageNav = new Pagenate($count, $page, PAGE_LIMIT);
$pageNav->setURL('tickets.php', $args);
$tickets = $pageNav->paginate($tickets);
@@ -367,15 +368,17 @@ return false;">
</div>
<div class="pull-right flush-right">
<?php
- if ($thisstaff->canManageTickets()) {
- echo TicketStatus::status_options();
- }
- if ($thisstaff->hasPerm(TicketModel::PERM_DELETE, false)) { ?>
- <a id="tickets-delete" class="red button action-button tickets-action"
- href="#tickets/status/delete"><i
- class="icon-trash"></i> <?php echo __('Delete'); ?></a>
- <?php
- } ?>
+ if ($count) {
+ if ($thisstaff->canManageTickets()) {
+ echo TicketStatus::status_options();
+ }
+ if ($thisstaff->hasPerm(TicketModel::PERM_DELETE, false)) { ?>
+ <a id="tickets-delete" class="red button action-button tickets-action"
+ href="#tickets/status/delete"><i
+ class="icon-trash"></i> <?php echo __('Delete'); ?></a>
+ <?php
+ }
+ }?>
</div>
</div>
</div>
--
GitLab