Merge branch '5.0-trunk'

Author: sunnavy

share/html/Elements/CollectionAsTable/Header

@@ -262,7 +262,7 @@ foreach my $col ( @Format ) {
             $field = "CustomField.{$name}";
         }
 
-        if ( $field ) {
+        if ( $field && $filter_comp ) {
             my $tooltip = loc( 'Filter on [_1]', loc($field) );
             my $icon = exists $filter_data{filter}{$field} ? 'funnel-fill' : 'funnel';
             $icon = RT::Interface::Web::MenuBuilder::GetSVGImage($icon);

share/html/NoAuth/css/elevator/BeforeNav

@@ -175,8 +175,8 @@ jQuery(function() {
 jQuery(window).on('load', function () {
     // set the right position of #topactions based on the logo size to allow for custom logos.
     // font size is calculated, to as close as possible, resemble setting in em instead of pixel.
-    var font_size = parseFloat(jQuery('body').css('font-size'));
-    jQuery('#topactions').css('right', jQuery('#logo').width() + font_size + 'px');
+    const logo = document.querySelector('#logo');
+    document.querySelector('#topactions').style.right = 'calc(' + [logo.offsetWidth + 'px', window.getComputedStyle(logo).right, '1em'].join(' + ') + ')';
 
     rebalanceOverflowMenu('#main-navigation', '#li-overflow');
     rebalanceOverflowMenu('#page-navigation', '#li-page-overflow');

share/html/Search/Elements/PickBasics

@@ -267,7 +267,7 @@ elsif ( $Class eq 'RT::Assets' ) {
             Value => {
                 Type => 'component',
                 Path => '/Asset/Elements/SelectStatus',
-                Arguments => { Catalogs => \%catalogs },
+                Arguments => { Catalogs => \%catalogs, ShowActiveInactive => 1 },
             },
         },
         {

share/static/css/elevator/nav.css

@@ -163,7 +163,10 @@
 #topactions {
     position: absolute;
     top: 0;
-    right: 18em;
+    /* 238px is the logo's width,
+     * 2px is logo's "right" position,
+     * 1em is to add some space between logo and topactions */
+    right: calc(238px + 2px + 1em);
     width: auto;
     font-size: 0.9em;
     z-index: 99;