diff -Naur rt3-dist/lib/RT/Ticket_Overlay.pm rt3/lib/RT/Ticket_Overlay.pm --- rt3-dist/lib/RT/Ticket_Overlay.pm Mon May 23 11:48:52 2005 +++ rt3/lib/RT/Ticket_Overlay.pm Mon May 23 11:12:53 2005 @@ -3669,6 +3669,56 @@ "RT::Queue-RT::Ticket"; } + + +=head2 PriorityAsString + + B 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 Sun Mar 6 14:32:18 2005 +++ rt3/share/html/Elements/RT__Ticket/ColumnMap Mon May 23 11:33:26 2005 @@ -157,17 +157,17 @@ }, Priority => { attribute => 'Priority', - value => sub { return $_[0]->Priority } + value => sub { return $RT::PriorityType?$_[0]->PriorityAsString() : $_[0]->Priority } }, InitialPriority => { attribute => 'InitialPriority', name => 'Initial Priority', - value => sub { return $_[0]->InitialPriority } + value => sub { return $RT::PriorityType?$_[0]->InitialPriorityAsString(): $_[0]->InitialPriority } }, FinalPriority => { attribute => 'FinalPriority', name => 'Final Priority', - 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 Wed Dec 31 16:00:00 1969 +++ rt3/share/html/Elements/SelectPriority Mon May 23 11:12:53 2005 @@ -0,0 +1,34 @@ +%# + + +<%ARGS> +$Name => undef +$Default => undef + + +<%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; + } +} + + diff -Naur rt3-dist/share/html/Search/Bulk.html rt3/share/html/Search/Bulk.html --- rt3-dist/share/html/Search/Bulk.html Sun Apr 17 18:43:44 2005 +++ rt3/share/html/Search/Bulk.html Mon May 23 11:12:53 2005 @@ -82,7 +82,11 @@ <%$Ticket->Id()%> % } %else { -<% eval "\$Ticket->$col()" %>  +% if (($col eq "Priority") && ($RT::PriorityType)) { + <%$Ticket->PriorityAsString()%> +% } else { + <% eval "\$Ticket->$col()" %>  +% } %} %} @@ -122,7 +126,11 @@ <&|/l&>Make subject: <&|/l&>Make priority: - +% if ($RT::PriorityType) { + <& /Elements/SelectPriority, Name => 'Priority', Default => 0 &> +% } else { + +% } <&|/l&>Make queue: <& /Elements/SelectQueue, Name => "Queue" &> <&|/l&>Make Status: diff -Naur rt3-dist/share/html/Search/Elements/PickBasics rt3/share/html/Search/Elements/PickBasics --- rt3-dist/share/html/Search/Elements/PickBasics Mon Mar 28 02:25:03 2005 +++ rt3/share/html/Search/Elements/PickBasics Mon May 23 11:44:03 2005 @@ -164,7 +164,11 @@ <& /Elements/SelectEqualityOperator, Name => "PriorityOp" &> - +% if ($RT::PriorityType) { + <&/Elements/SelectPriority, Name=>"ValueOfPriority" &> +% } else { + +% } diff -Naur rt3-dist/share/html/Ticket/Create.html rt3/share/html/Ticket/Create.html --- rt3-dist/share/html/Ticket/Create.html Sun Apr 17 18:43:44 2005 +++ rt3/share/html/Ticket/Create.html Mon May 23 11:12:53 2005 @@ -181,8 +181,16 @@ title_class=> 'inverse', color => "#993333" &> +% if ($RT::PriorityType) { + +%} else { +%} +% if ($RT::PriorityType) { + +%} else { +%}
<&|/l&>Priority:<&/Elements/SelectPriority, Name=>"InitialPriority", Default=> $ARGS{InitialPriority}?$ARGS{InitialPriority}:$QueueObj->InitialPriority &>
<&|/l&>Priority:
<&|/l&>Final Priority:<&/Elements/SelectPriority, Name=>"FinalPriority", Default=> $ARGS{FinalPriority}?$ARGS{FinalPriority}:$QueueObj->FinalPriority &>
<&|/l&>Final Priority:
<&|/l&>Time Worked:<&|/l,''&>[_1] min
<&|/l&>Time Left:<&|/l,''&>[_1] min
diff -Naur rt3-dist/share/html/Ticket/Elements/EditBasics rt3/share/html/Ticket/Elements/EditBasics --- rt3-dist/share/html/Ticket/Elements/EditBasics Tue Feb 1 06:20:40 2005 +++ rt3/share/html/Ticket/Elements/EditBasics Mon May 23 11:12:53 2005 @@ -72,12 +72,20 @@ <&|/l&>Priority: +% if ($RT::PriorityType) { + <&/Elements/SelectPriority, Name=>"Priority", Default=>$TicketObj->Priority &> +% } else { +% } <&|/l&>Final Priority: +% if ($RT::PriorityType) { + <&/Elements/SelectPriority, Name=>"FinalPriority", Default=>$TicketObj->FinalPriority &> +% } else { +% } <& /Elements/Callback, _CallbackName => 'EndOfList', TicketObj => $TicketObj, %ARGS &> diff -Naur rt3-dist/share/html/Ticket/Elements/ShowBasics rt3/share/html/Ticket/Elements/ShowBasics --- rt3-dist/share/html/Ticket/Elements/ShowBasics Tue Feb 1 06:20:40 2005 +++ rt3/share/html/Ticket/Elements/ShowBasics Mon May 23 11:12:53 2005 @@ -70,7 +70,11 @@ <&|/l&>Priority: - <%$Ticket->Priority%>/<%$Ticket->FinalPriority %> +% if ($RT::PriorityType == 0) { + <%$Ticket->Priority%>/<%$Ticket->FinalPriority %> +% } else { + <%$Ticket->PriorityAsString()%>/<%$Ticket->FinalPriorityAsString()%> +% } <&|/l&>Queue: