Skip to content

Commit

Permalink
Merge branch '5.0/txn-search-chart' into 5.0-trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
cbrandtbuffalo committed Dec 15, 2023
2 parents 2ee360a + 5560234 commit d45c955
Show file tree
Hide file tree
Showing 29 changed files with 2,543 additions and 1,442 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This Dockerfile is for testing only.

FROM bpssysadmin/rt-base-debian:RT-5.0.4-buster-20230703
FROM bpssysadmin/rt-base-debian:RT-5.0.5-buster-20231215

ENV RT_TEST_PARALLEL 1
ENV RT_TEST_DEVEL 1
Expand Down
2 changes: 1 addition & 1 deletion etc/cpanfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ requires 'DateTime', '>= 0.44';
requires 'DateTime::Format::Natural', '>= 0.67';
requires 'DateTime::Locale', '>= 0.40, != 1.00, != 1.01';
requires 'DBI', '>= 1.37';
requires 'DBIx::SearchBuilder', '>= 1.77';
requires 'DBIx::SearchBuilder', '>= 1.80';
requires 'Devel::GlobalDestruction';
requires 'Devel::StackTrace', '>= 1.19, != 1.28, != 1.29';
requires 'Digest::base';
Expand Down
20 changes: 20 additions & 0 deletions lib/RT/CustomField.pm
Original file line number Diff line number Diff line change
Expand Up @@ -2381,6 +2381,26 @@ sub CleanupDefaultValues {
}
}

=head2 IsNumeric
Returns true if the custom field is supposed to be numeric, default is 0.
Right now you need to override this method to mark the chosen ones numeric.
=cut

sub IsNumeric { 0 }

=head2 NumericPrecision
Returns the precision if the custom field is numeric, default is C<undef>.
Right now you need to override this method to customize it.
=cut

sub NumericPrecision { undef }

=head2 id
Returns the current value of id.
Expand Down
3 changes: 3 additions & 0 deletions lib/RT/Interface/Web/MenuBuilder.pm
Original file line number Diff line number Diff line change
Expand Up @@ -760,6 +760,9 @@ sub BuildMainNav {
elsif ( $class eq 'RT::Assets' ) {
$current_search_menu->child( bulk => title => loc('Bulk Update'), path => "/Asset/Search/Bulk.html$args" );
}
elsif ( $class eq 'RT::Transactions' ) {
$current_search_menu->child( chart => title => loc('Chart'), path => "/Search/Chart.html$args" );
}

my $more = $current_search_menu->child( more => title => loc('Feeds') );

Expand Down

0 comments on commit d45c955

Please sign in to comment.