show only columns which exist in dataset

[MojoFacets.git] / lib / MojoFacets / Data.pm

diff --git a/lib/MojoFacets/Data.pm b/lib/MojoFacets/Data.pm
index 3a4df8e..81e434b 100644 (file)
--- a/lib/MojoFacets/Data.pm
+++ b/lib/MojoFacets/Data.pm
@@ -82,9 +82,9 @@ sub columns {
 
 
        my @columns;
-       @columns = @{ $self->session('columns') } if $self->session('columns');
+       @columns = grep { defined $stats->{$_}->{count} } @{ $self->session('columns') } if $self->session('columns');
 
-       foreach my $c ( sort { $stats->{$b}->{count} <=> $stats->{$a}->{count} } keys %$stats ) {
+       foreach my $c ( sort { $stats->{$b}->{count} <=> $stats->{$a}->{count} } grep { defined $stats->{$_}->{count} } keys %$stats ) {
                push @columns, $c unless grep { /^\Q$c\E$/ } @columns;
        }