#
# priority-labels-v2-rt3.2.2.patch
# By Colin Henein, Parliant Corporation after Eric Berggren
# Replaces numeric priorities with labels in rt3.2.2
# see http://www.parliant.com/~cmh/rt/ for details and instructions
#
diff -Naur rt3-dist/lib/RT/Ticket_Overlay.pm rt3/lib/RT/Ticket_Overlay.pm
--- rt3-dist/lib/RT/Ticket_Overlay.pm	Fri Sep 24 05:21:43 2004
+++ rt3/lib/RT/Ticket_Overlay.pm	Sun Oct  3 19:50:53 2004
@@ -3987,6 +3987,56 @@
 
 # }}}
 
+
+
+=head2 PriorityAsString
+
+ B<Returns> String: Various Ticket Priorities as either a string or integer
+
+=cut
+
+sub PriorityAsString {
+    my $self=shift;
+
+    unless ($self->CurrentUserHasRight('ShowTicket')) {
+        return undef;
+    }
+    return priorityString($self->Priority)
+}
+sub InitialPriorityAsString {
+    my $self=shift;
+
+    unless ($self->CurrentUserHasRight('ShowTicket')) {
+        return undef;
+    }
+    return priorityString($self->InitialPriority)
+}
+sub FinalPriorityAsString {
+    my $self=shift;
+
+    unless ($self->CurrentUserHasRight('ShowTicket')) {
+        return undef;
+    }
+    return priorityString($self->FinalPriority)
+}
+
+sub priorityString {
+    my $priority=shift;
+
+    if ( $RT::PriorityType ) {
+        foreach my $pridx ( @RT::PrioritySortedKeys ) {
+            if ( $priority >= $RT::PriorityLabels{ $pridx } ) {
+                return($pridx."/".$priority) if ( $RT::PriorityType != 1 );
+                return($pridx);
+            }
+        }
+        return "unknown";
+    }
+    return ($priority);
+}
+
+
+
 1;
 
 =head1 AUTHOR
diff -Naur rt3-dist/share/html/Elements/RT__Ticket/ColumnMap rt3/share/html/Elements/RT__Ticket/ColumnMap
--- rt3-dist/share/html/Elements/RT__Ticket/ColumnMap	Wed Sep  8 21:41:43 2004
+++ rt3/share/html/Elements/RT__Ticket/ColumnMap	Sun Oct  3 20:32:09 2004
@@ -133,15 +133,15 @@
     },
     Priority => {
         attribute => 'Priority',
-        value     => sub { return $_[0]->Priority }
+        value     => sub { return $RT::PriorityType?$_[0]->PriorityAsString() : $_[0]->Priority }
     },
     InitialPriority => {
         attribute => 'InitialPriority',
-        value     => sub { return $_[0]->InitialPriority }
+        value     => sub { return $RT::PriorityType?$_[0]->InitialPriorityAsString(): $_[0]->InitialPriority }
     },
     FinalPriority => {
         attribute => 'FinalPriority',
-        value     => sub { return $_[0]->FinalPriority }
+        value     => sub { return $RT::PriorityType?$_[0]->FinalPriorityAsString():$_[0]->FinalPriority }
     },
     EffectiveId => {
         attribute => 'EffectiveId',
diff -Naur rt3-dist/share/html/Elements/SelectPriority rt3/share/html/Elements/SelectPriority
--- rt3-dist/share/html/Elements/SelectPriority	Thu Jan  1 00:00:00 1970
+++ rt3/share/html/Elements/SelectPriority	Sun Oct  3 19:50:53 2004
@@ -0,0 +1,34 @@
+%#
+
+<SELECT NAME ="<%$Name%>">
+% foreach $priidx (@RT::PrioritySortedKeys) {
+%   my($value)=$RT::PriorityLabels{$priidx};
+%   my($prilabel)=$priidx;
+%   if ( $priidx eq $defprilabel ) {
+%     $prilabel .= " (".$defprivalue.")" if ($RT::PriorityType > 1);
+<OPTION VALUE="<%$defprivalue%>" SELECTED><%$prilabel%></OPTION>
+%   } else {
+%     $prilabel .= " (".$value.")" if ($RT::PriorityType > 1);
+<OPTION VALUE="<%$value%>"><%$prilabel%></OPTION>
+%   }
+% }
+</SELECT>
+<%ARGS>
+$Name => undef
+$Default => undef
+ 
+</%ARGS>
+<%INIT>
+my($priidx,$defprilabel,$defprivalue);
+foreach $priidx (@RT::PrioritySortedKeys) {
+      if ( $Default >= $RT::PriorityLabels{$priidx}) {
+              # save current equivalent priority label
+              $defprilabel=$priidx;
+              # save current priority value to prevent tickets from having
+              #  their priorities "snap"ed to closest level
+              $defprivalue=$Default;
+              last;
+      }
+}
+</%INIT>
+
diff -Naur rt3-dist/share/html/Search/Bulk.html rt3/share/html/Search/Bulk.html
--- rt3-dist/share/html/Search/Bulk.html	Wed Aug 18 02:23:42 2004
+++ rt3/share/html/Search/Bulk.html	Sun Oct  3 19:50:53 2004
@@ -83,7 +83,11 @@
 <A HREF="<% $RT::WebPath%>/Ticket/Display.html?id=<%$Ticket->Id%>"><%$Ticket->Id()%></A>
 % }
 %else {
-<% eval "\$Ticket->$col()" %>&nbsp;
+%   if (($col eq "Priority") && ($RT::PriorityType)) {
+       <%$Ticket->PriorityAsString()%>
+%   } else {
+       <% eval "\$Ticket->$col()" %>&nbsp;
+%   }
 %}
 </TD>
 %}
@@ -123,7 +127,11 @@
 <tr><td class=label> <&|/l&>Make subject</&>: </td>
 <td class=value> <INPUT Name="Subject" SIZE=20> </td></tr>
 <tr><td class=label> <&|/l&>Make priority</&>: </td>
-<td class=value> <INPUT Name="Priority" SIZE=4> </td></tr>
+% if ($RT::PriorityType) {
+	<td class=value><& /Elements/SelectPriority, Name => 'Priority', Default => 0 &></td></tr>
+% } else {
+	<td class=value> <INPUT Name="Priority" SIZE=4> </td></tr>
+% }
 <tr><td class=label> <&|/l&>Make queue</&>: </td>
 <td class=value> <& /Elements/SelectQueue, Name => "Queue" &> </td></tr>
 <tr><td class=label> <&|/l&>Make Status</&>: </td>
diff -Naur rt3-dist/share/html/Search/Elements/PickBasics rt3/share/html/Search/Elements/PickBasics
--- rt3-dist/share/html/Search/Elements/PickBasics	Tue Aug 31 04:22:49 2004
+++ rt3/share/html/Search/Elements/PickBasics	Sun Oct  3 20:12:04 2004
@@ -83,7 +83,11 @@
 </td><td>
 <& /Elements/SelectEqualityOperator, Name => "PriorityOp" &>
 </td><td>
-<INPUT Name="ValueOfPriority" SIZE=5>
+%  if ($RT::PriorityType) {
+   <&/Elements/SelectPriority, Name=>"ValueOfPriority" &>
+%  } else {
+   <INPUT Name="ValueOfPriority" SIZE=5>
+%  }
 %} elsif ($field =~ m/Time.*/) {
 <SELECT NAME="TimeField">
 <OPTION VALUE="TimeWorked"><&|/l&>Time Worked</&></OPTION>
diff -Naur rt3-dist/share/html/Ticket/Create.html rt3/share/html/Ticket/Create.html
--- rt3-dist/share/html/Ticket/Create.html	Thu Jul 29 00:08:11 2004
+++ rt3/share/html/Ticket/Create.html	Sun Oct  3 20:41:10 2004
@@ -172,8 +172,16 @@
 		title_class=> 'inverse',  
 		color => "#993333" &>
 <TABLE BORDER=0>
+% if ($RT::PriorityType) {
+<TR><TD ALIGN=RIGHT><&|/l&>Priority</&>:</TD><TD><&/Elements/SelectPriority, Name=>"InitialPriority", Default=> $ARGS{InitialPriority}?$ARGS{InitialPriority}:$QueueObj->InitialPriority &></TD></TR>
+%} else {
 <TR><TD ALIGN=RIGHT><&|/l&>Priority</&>:</TD><TD><input size=3 name="InitialPriority" value="<% $ARGS{InitialPriority} ? $ARGS{InitialPriority} : $QueueObj->InitialPriority %>"></TD></TR>
+%}
+% if ($RT::PriorityType) {
+<TR><TD ALIGN=RIGHT><&|/l&>Final Priority</&>:</TD><TD><&/Elements/SelectPriority, Name=>"FinalPriority", Default=> $ARGS{FinalPriority}?$ARGS{FinalPriority}:$QueueObj->FinalPriority &></TD></TR>
+%} else {
 <TR><TD ALIGN=RIGHT><&|/l&>Final Priority</&>:</TD><TD><input size=3 name="FinalPriority" value="<% $ARGS{FinalPriority} ? $ARGS{FinalPriority} : $QueueObj->FinalPriority %>"></TD></TR>
+%}
 <TR><TD ALIGN=RIGHT><&|/l&>Time Worked</&>:</TD><TD><&|/l,'<input size=3 name="TimeWorked" value="'.$ARGS{TimeWorked}.'">'&>[_1] min</&></TD></TR>
 <TR><TD ALIGN=RIGHT><&|/l&>Time Left</&>:</TD><TD><&|/l,'<input size=3 name="TimeLeft" value="'.$ARGS{TimeLeft}.'">'&>[_1] min</&></TD></TR>
 </TABLE>
diff -Naur rt3-dist/share/html/Ticket/Elements/EditBasics rt3/share/html/Ticket/Elements/EditBasics
--- rt3-dist/share/html/Ticket/Elements/EditBasics	Tue Aug 31 18:49:23 2004
+++ rt3/share/html/Ticket/Elements/EditBasics	Sun Oct  3 20:42:33 2004
@@ -72,12 +72,20 @@
 
   <TR>
       <td class="label"><&|/l&>Priority</&>:</td>
+% if ($RT::PriorityType) {
+      <td class="value"><&/Elements/SelectPriority, Name=>"Priority", Default=>$TicketObj->Priority &></td>
+% } else {
       <td class="value"><input name=Priority value="<%$TicketObj->Priority|h%>" SIZE="5"></td>
+% }
     </TR>
 
   <TR>
       <td class="label"><&|/l&>Final Priority</&>:</td>
+% if ($RT::PriorityType) {
+      <td class="value"><&/Elements/SelectPriority, Name=>"FinalPriority", Default=>$TicketObj->FinalPriority &></td>
+% } else {
       <td class="value"><input name=FinalPriority value="<%$TicketObj->FinalPriority|h%>" SIZE="5"></td>
+% }
     </TR>
 <& /Elements/Callback, _CallbackName => 'EndOfList', TicketObj => $TicketObj, %ARGS &>
 </TABLE>
diff -Naur rt3-dist/share/html/Ticket/Elements/ShowBasics rt3/share/html/Ticket/Elements/ShowBasics
--- rt3-dist/share/html/Ticket/Elements/ShowBasics	Tue Aug 31 18:49:23 2004
+++ rt3/share/html/Ticket/Elements/ShowBasics	Sun Oct  3 19:50:57 2004
@@ -70,7 +70,11 @@
   </tr>
   <tr>
     <td class="label"><&|/l&>Priority</&>:</td>
-    <td class="value"><%$Ticket->Priority%>/<%$Ticket->FinalPriority %></td>
+% if ($RT::PriorityType == 0) {
+        <td class="value"><%$Ticket->Priority%>/<%$Ticket->FinalPriority %></td>
+% } else {
+	<td class="value"><%$Ticket->PriorityAsString()%>/<%$Ticket->FinalPriorityAsString()%></td>
+% }
   </tr>
   <tr>
     <td class="label"><&|/l&>Queue</&>:</td>