[Rt-commit] rt branch, 5.0-trunk, updated. rt-5.0.1-431-g5329057fd9

[? sunnavy]

The branch, 5.0-trunk has been updated
       via  5329057fd9a792d4cd3dafe90725e3f56602aeca (commit)
       via  7bdfdc2d0147d60ba9d57a9c4958a0c45671f48d (commit)
       via  34fc91c078674a65131fe30b2f7b6bcee0561897 (commit)
      from  89a7ffe2aa3ea69c8aa08f1e87c2060b086c3c8f (commit)

Summary of changes:
 share/html/Elements/RT__Ticket/ColumnMap   |  3 ++-
 share/html/Elements/SelectPriorityAsString |  2 +-
 share/html/Ticket/Elements/ShowPriority    | 10 ++--------
 3 files changed, 5 insertions(+), 10 deletions(-)

- Log -----------------------------------------------------------------
commit 34fc91c078674a65131fe30b2f7b6bcee0561897
Author: Emmanuel Lacour <elacour at easter-eggs.com>
Date:   Mon May 10 16:05:30 2021 +0200

    Use CSSClass() to clean up spaces/non-ascii chars on priority select

diff --git a/share/html/Elements/SelectPriorityAsString b/share/html/Elements/SelectPriorityAsString
index 81f65c75eb..b2e24b2b15 100644
--- a/share/html/Elements/SelectPriorityAsString
+++ b/share/html/Elements/SelectPriorityAsString
@@ -62,7 +62,7 @@
             ($value, $selected) = ($Default, 'selected="selected"');
         }
 </%PERL>
-    <option class="priority-<% lc $label %>" value="<% $value %>" <% $selected |n %>><% loc($label) %></option>
+    <option class="priority-<% CSSClass(lc $label) %>" value="<% $value %>" <% $selected |n %>><% loc($label) %></option>
 %   }
 %   if ( $group_by_name ) {
   </optgroup>

commit 7bdfdc2d0147d60ba9d57a9c4958a0c45671f48d
Author: Emmanuel Lacour <elacour at easter-eggs.com>
Date:   Mon May 10 16:04:15 2021 +0200

    Use CSSClass() to clean up spaces/non-ascii chars search results

diff --git a/share/html/Elements/RT__Ticket/ColumnMap b/share/html/Elements/RT__Ticket/ColumnMap
index 6c6cd03082..9a98d13b1d 100644
--- a/share/html/Elements/RT__Ticket/ColumnMap
+++ b/share/html/Elements/RT__Ticket/ColumnMap
@@ -411,7 +411,8 @@ if ( RT->Config->Get('EnablePriorityAsString') ) {
 
         my $escaped     = $m->interp->apply_escapes( $string,      'h' );
         my $loc_escaped = $m->interp->apply_escapes( loc($string), 'h' );
-        return \( qq{<span class="ticket-info-$class-} . lc($escaped) . qq{">$loc_escaped</span>} );
+
+        return \( qq{<span class="ticket-info-$class-} . CSSClass(lc($escaped)) . qq{">$loc_escaped</span>} );
 
     };
     foreach my $field (qw(Priority InitialPriority FinalPriority)) {

commit 5329057fd9a792d4cd3dafe90725e3f56602aeca
Author: Emmanuel Lacour <elacour at easter-eggs.com>
Date:   Mon May 10 16:02:20 2021 +0200

    Use core RT::Interface::Web::CSSClass for priority
    
    When PriorityAsString was shipped as an RT extension it was needed to
    duplicate this method here to be compatible with RT 4.0. It's no longer
    needed now that it has been cored in RT 5.

diff --git a/share/html/Ticket/Elements/ShowPriority b/share/html/Ticket/Elements/ShowPriority
index df75fa550b..4c5b50c68e 100644
--- a/share/html/Ticket/Elements/ShowPriority
+++ b/share/html/Ticket/Elements/ShowPriority
@@ -50,8 +50,8 @@
 % } else {
 % my $current = $Ticket->PriorityAsString || '';
 % my $final = $Ticket->FinalPriorityAsString || '';
-<span class="Priority ticket-info-priority-<% $CSSClass->(lc($current)) %>"><% loc($current) %></span>/\
-<span class="FinalPriority ticket-info-final-priority-<% $CSSClass->(lc($final)) %>"><% loc($final) %></span>
+<span class="Priority ticket-info-priority-<% CSSClass(lc($current)) %>"><% loc($current) %></span>/\
+<span class="FinalPriority ticket-info-final-priority-<% CSSClass(lc($final)) %>"><% loc($final) %></span>
 % }
 <%ARGS>
 $Ticket => undef
@@ -66,10 +66,4 @@ if ( RT->Config->Get('EnablePriorityAsString') ) {
     $use_numeric = 0 if exists $config{$queue_name} ? $config{$queue_name} : $config{Default};
 }
 
-my $CSSClass = sub {
-    my $value = shift;
-    return '' unless defined $value;
-    $value =~ s/[^A-Za-z0-9_-]/_/g;
-    return $value;
-};
 </%INIT>

-----------------------------------------------------------------------