From dfba562ff61f541ba7c75f2c02b32951b73aa002 Mon Sep 17 00:00:00 2001
From: mark <mark>
Date: Wed, 24 Aug 2011 21:00:59 +0000
Subject: selfservice priority sort order, #14029

---
 httemplate/view/cust_main/tickets.html | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'httemplate/view/cust_main')

diff --git a/httemplate/view/cust_main/tickets.html b/httemplate/view/cust_main/tickets.html
index 863c66be4..adfaead6e 100644
--- a/httemplate/view/cust_main/tickets.html
+++ b/httemplate/view/cust_main/tickets.html
@@ -133,11 +133,22 @@ my $new_link = FS::TicketSystem->href_new_ticket( $cust_main );
 
 my $ss_priority = FS::TicketSystem->selfservice_priority;
 if ( $ss_priority ) {
+  my $dir = $conf->exists('ticket_system-priority_reverse') ? -1 : 1;
   use sort 'stable';
-  no warnings 'uninitialized';
+  # sort in the following way:
   @tickets = sort { 
-    ($b->{'content'} eq $a->{'content'}) &&
-    $b->{'_selfservice_priority'} <=> $a->{'_selfservice_priority'}
+    # within a severity level...
+    ( $a->{'content'} eq $b->{'content'} ) ? (
+      # no-priority tickets sort last
+      (
+        ($a->{'_selfservice_priority'} eq '') <=> 
+        ($b->{'_selfservice_priority'} eq '')
+      ) ||
+      # otherwise obey ticket_system-priority_reverse
+      ( $dir * 
+        ($b->{'_selfservice_priority'} <=> $a->{'_selfservice_priority'})
+      )
+    ) : 0; # but don't rearrange between severity levels
   } @tickets;
 }
 
-- 
cgit v1.2.1