X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FHelper%2FCustomVariables.pm;h=d23e46e9758128140976c46a599dc100e41d3169;hb=03facf5ab7c76dda121669574aacfe7f30f417ca;hp=6ebebda418e93db1c5f7943ee1d01610f5ee1121;hpb=62750c33f1f639845d58bb74008609bdfd273ff6;p=kivitendo-erp.git diff --git a/SL/DB/Helper/CustomVariables.pm b/SL/DB/Helper/CustomVariables.pm index 6ebebda41..d23e46e97 100644 --- a/SL/DB/Helper/CustomVariables.pm +++ b/SL/DB/Helper/CustomVariables.pm @@ -4,6 +4,7 @@ use strict; use Carp; use Data::Dumper; use List::Util qw(first); +use List::UtilsBy qw(sort_by); use constant META_CVARS => 'cvars_config'; @@ -98,6 +99,8 @@ sub make_cvar_by_configs { @$configs ); + @return = sort_by { $_->config->sortkey } @return; + return \@return; } } @@ -327,7 +330,7 @@ sub make_cvar_custom_filter { # remove rose aliases. query builder sadly is not reentrant, and will reuse the same aliases. :( $query{$key} =~ s{\bt\d+(?:\.)?\b}{}g; - # manually inline the values. again, rose doen't know how to handle bind params in subqueries :( + # manually inline the values. again, rose doesn't know how to handle bind params in subqueries :( $query{$key} =~ s{\?}{ $config->dbh->quote(shift @{ $bind_vals{$key} }) }xeg; $query{$key} =~ s{\n}{ }g; @@ -510,6 +513,23 @@ If the Manager for the calling C has included the helper Ls.schoeling@linet-services.deE,