From 168c3aa98f5886796ff90a62390fb072161e8e23 Mon Sep 17 00:00:00 2001 From: Peter Rotich <peter@osticket.com> Date: Wed, 27 Aug 2014 15:23:30 +0000 Subject: [PATCH] Use ticket state verb --- include/staff/templates/status-options.tmpl.php | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/include/staff/templates/status-options.tmpl.php b/include/staff/templates/status-options.tmpl.php index 5fc39f32a..ebc5db6cb 100644 --- a/include/staff/templates/status-options.tmpl.php +++ b/include/staff/templates/status-options.tmpl.php @@ -1,24 +1,21 @@ <?php $actions= array( 'close' => array( - 'action' => __('Close'), 'icon' => 'icon-repeat', - 'states' => array('closed') + 'state' => 'closed' ), 'resolve' => array( - 'action' => __('Resolve'), 'icon' => 'icon-ok-circle', - 'states' => array('resolved') + 'state' => 'resolved' ), 'reopen' => array( - 'action' => __('Reopen'), 'icon' => 'icon-undo', - 'states' => array('open') + 'state' => 'open' ), ); foreach($actions as $k => $v) { - $criteria = array('states' => $v['states']); + $criteria = array('states' => array($v['state'])); if (!($statuses = TicketStatusList::getStatuses($criteria)->all())) continue; @@ -30,7 +27,8 @@ foreach($actions as $k => $v) { <a id="tickets-<?php echo $k; ?>" class="tickets-action" href="#tickets/status/<?php echo $k; ?>"><i - class="<?php echo $v['icon']; ?>"></i> <?php echo $v['action']; ?></a> + class="<?php echo $v['icon']; ?>"></i> <?php + echo TicketStateField::getVerb($v['state']); ?></a> <i class="icon-caret-down"></i> </span> <div id="action-dropdown-<?php echo $k; ?>" @@ -54,7 +52,8 @@ foreach($actions as $k => $v) { ?> <a id="tickets-<?php echo $k; ?>" class="action-button tickets-action" href="#tickets/status/<?php echo $k; ?>"><i - class="<?php echo $v['icon']; ?>"></i> <?php echo $v['action']; ?></a> + class="<?php echo $v['icon']; ?>"></i> <?php + echo TicketStateField::getVerb($v['state']); ?></a> <?php } } -- GitLab