[Rt-commit] rt branch, 4.6/priority-as-string, created. rt-4.4.2-96-gab4241bc9
Brian Duggan
brian at bestpractical.com
Tue May 29 19:09:34 EDT 2018
The branch, 4.6/priority-as-string has been created
at ab4241bc90ec9e20433b4faa8a43d55aa235d436 (commit)
- Log -----------------------------------------------------------------
commit ab4241bc90ec9e20433b4faa8a43d55aa235d436
Author: Brian C. Duggan <brian at bestpractical.com>
Date: Tue May 29 19:08:30 2018 -0400
Core RT::Extension::PriorityAsString
Port functionality of RT::Extension::PriorityAsString. Replicate
existing behavior of extension.
diff --git a/lib/RT/Ticket.pm b/lib/RT/Ticket.pm
index 08169fb9c..467322144 100644
--- a/lib/RT/Ticket.pm
+++ b/lib/RT/Ticket.pm
@@ -94,6 +94,10 @@ use RT::SLA;
use MIME::Entity;
use Devel::GlobalDestruction;
+$RT::Config::META{PriorityAsString}{Type} = 'HASH';
+$RT::Config::META{PriorityAsStringOrder}{Type} = 'ARRAY';
+$RT::Config::META{PriorityAsStringQueues}{Type} = 'HASH';
+
sub LifecycleColumn { "Queue" }
my %ROLES = (
@@ -3697,6 +3701,52 @@ sub Serialize {
return %store;
}
+sub PriorityIsString {
+ my $self = shift;
+ my %queues = RT->Config->Get('PriorityAsStringQueues');
+ return 0 if (keys %queues and not $queues{$self->QueueObj->Name});
+ return 1;
+}
+
+# Returns String: Various Ticket Priorities as either a string or integer
+sub PriorityAsString {
+ my $self = shift;
+ return $self->_PriorityAsString($self->Priority);
+}
+
+sub InitialPriorityAsString {
+ my $self = shift;
+ return $self->_PriorityAsString( $self->InitialPriority );
+}
+
+sub FinalPriorityAsString {
+ my $self=shift;
+ return $self->_PriorityAsString( $self->FinalPriority );
+}
+
+sub _PriorityAsString {
+ my $self = shift;
+ my $priority = shift;
+ return undef unless defined $priority && length $priority;
+
+ my %map;
+ my $queues = RT->Config->Get('PriorityAsStringQueues');
+ if (@_) {
+ %map = %{ shift(@_) };
+ } elsif ($queues and $queues->{$self->QueueObj->Name}) {
+ %map = %{ $queues->{$self->QueueObj->Name} };
+ } else {
+ %map = RT->Config->Get('PriorityAsString');
+ }
+
+ # Count from high down to low until we find one that our number is
+ # greater than or equal to.
+ foreach my $label ( sort { $map{$b} <=> $map{$a} } keys %map ) {
+ return $label if $priority >= $map{ $label };
+ }
+ return "unknown";
+}
+
RT::Base->_ImportOverlays();
1;
diff --git a/share/html/Elements/RT__Ticket/ColumnMap b/share/html/Elements/RT__Ticket/ColumnMap
index 089ccea11..d5663f428 100644
--- a/share/html/Elements/RT__Ticket/ColumnMap
+++ b/share/html/Elements/RT__Ticket/ColumnMap
@@ -153,19 +153,19 @@ $COLUMN_MAP = {
Priority => {
title => 'Priority', # loc
attribute => 'Priority',
- value => sub { return $_[0]->Priority }
+ value => sub { return $_[0]->PriorityAsString }
},
InitialPriority => {
title => 'InitialPriority', # loc
attribute => 'InitialPriority',
name => 'Initial Priority',
- value => sub { return $_[0]->InitialPriority }
+ value => sub { return $_[0]->InitialPriorityAsString }
},
FinalPriority => {
title => 'FinalPriority', # loc
attribute => 'FinalPriority',
name => 'Final Priority',
- value => sub { return $_[0]->FinalPriority }
+ value => sub { return $_[0]->FinalPriorityAsString }
},
EffectiveId => {
title => 'EffectiveId', # loc
diff --git a/share/html/Elements/SelectPriority b/share/html/Elements/SelectPriority
index 078d85df7..40a26a9a6 100644
--- a/share/html/Elements/SelectPriority
+++ b/share/html/Elements/SelectPriority
@@ -48,8 +48,32 @@
<input name="<% $Name %>" value="<% $Default %>" size="5" />
<%ARGS>
$Name => 'Priority'
-$Default => ''
+$Default => undef
</%ARGS>
<%INIT>
+
+my %queues = RT->Config->Get('PriorityAsStringQueues');
+
+# If enabled for all queues, always show the drop-down
+return $m->comp("/Elements/SelectPriorityAsString",%ARGS)
+ unless keys %queues;
+
+# Some callsites we can easily override with callbacks with logic to
+# know when to call SelectPriorityAsString; for ticket create and queue
+# modify, we need to inspect the callstack.
+my $caller = $m->callers(1)->path;
+my $caller_args = $m->caller_args(1);
+my $QueueObj = RT::Queue->new( $session{'CurrentUser'} );
+if ( $caller eq "/Admin/Queues/Modify.html") {
+ $QueueObj->Load( $caller_args->{id} ) || $QueueObj->Load( $caller_args->{Name} );
+} elsif ( $caller eq "/Ticket/Create.html" or $caller eq "/m/ticket/create" ) {
+ RT::Logger->debug("Pri3");
+ $QueueObj->Load( $caller_args->{Queue} );
+}
+RT::Logger->debug("Queue ID: ".$QueueObj->Id);
+RT::Logger->debug("Queue Name: ".$QueueObj->Name);
+return $m->comp("/Elements/SelectPriorityAsString",%ARGS, Mapping => $queues{$QueueObj->Name})
+ if $QueueObj->Id and $queues{$QueueObj->Name};
+
$Default = '' unless defined $Default;
</%INIT>
diff --git a/share/html/Ticket/Elements/EditBasics b/share/html/Ticket/Elements/EditBasics
index c4505e770..7bbb1e3fa 100644
--- a/share/html/Ticket/Elements/EditBasics
+++ b/share/html/Ticket/Elements/EditBasics
@@ -58,6 +58,16 @@ if ($TicketObj) {
$QueueObj ||= $TicketObj->QueueObj;
}
+my %queue_priority_strings = RT->Config->Get('PriorityAsStringQueues');
+
+# Leave it as-is if all queues use PriorityAsString; the overridden
+# /Elements/SelectPriority catches this case and always shows the
+# drop-down
+#return unless keys %as_string;
+
+# Only applies if the ticket is in a PriorityAsString queue
+#return unless $TicketObj and $as_string{$TicketObj->QueueObj->Name};
+
unless ( @fields ) {
my $subject = $defaults{'Subject'} || $TicketObj->Subject;
@fields = (
@@ -124,10 +134,15 @@ unless ( @fields ) {
(my $field = $_) =~ s/ //g;
{
name => $_,
- comp => '/Elements/SelectPriority',
+ comp => $TicketObj->PriorityIsString
+ ? '/Elements/SelectPriorityAsString'
+ : '/Elements/SelectPriority',
args => {
Name => $field,
Default => $defaults{$field} || $TicketObj->$field,
+ Mapping => $TicketObj->PriorityIsString
+ ? $queue_priority_strings{$TicketObj->QueueObj->Name}
+ : undef,
}
}
} ('Priority', 'Final Priority')
diff --git a/share/html/Ticket/Elements/ShowPriority b/share/html/Ticket/Elements/ShowPriority
index c465d4875..122382037 100644
--- a/share/html/Ticket/Elements/ShowPriority
+++ b/share/html/Ticket/Elements/ShowPriority
@@ -45,7 +45,23 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
+%# if (keys %queues and not $queues{$Ticket->QueueObj->Name}) {
+% if ( $Ticket->PriorityIsString ) {
+% my $current = $Ticket->PriorityAsString || '';
+% my $final = $Ticket->FinalPriorityAsString || '';
+<span class="ticket-info-priority-<% $CSSClass->(lc($current)) %>"><% loc($current) %></span>/\
+<span class="ticket-info-final-priority-<% $CSSClass->(lc($final)) %>"><% loc($final) %></span>
+% } else {
<% $Ticket->Priority %>/<% $Ticket->FinalPriority || ''%>
+% }
<%ARGS>
$Ticket => undef
</%ARGS>
+<%INIT>
+my $CSSClass = sub {
+ my $value = shift;
+ return '' unless defined $value;
+ $value =~ s/[^A-Za-z0-9_-]/_/g;
+ return $value;
+};
+</%INIT>
-----------------------------------------------------------------------
More information about the rt-commit
mailing list