tweak columns acquision order

This allows us again just to reload table data after we restart server,
since we don't require columns (which isn't saved until user selects
save for the first time) but headers which is there.
However, if we do have columns in session, we'll use that (which is
required for code eval to add new columns).

diff --git a/lib/MojoFacets/Data.pm b/lib/MojoFacets/Data.pm
index e7df0ef..08a0a64 100644 (file)
--- a/lib/MojoFacets/Data.pm
+++ b/lib/MojoFacets/Data.pm
@@ -453,12 +453,15 @@ sub _filter_on_data {
 sub _current_filters {
        my $self = shift;
        my $current_filters;
+       my $columns = $self->_loaded('header');
+       if ( my $sc = $self->session('columns') ) {
+               $columns = $sc;
+       }
+
        $current_filters->{ $_ } = $filters->{ $_ }
-               foreach (
-                       grep { defined $filters->{ $_ } }
-                       @{ $self->_loaded('columns') }
-               );
-       #warn "# current_filters ",dump($current_filters);
+               foreach ( grep { defined $filters->{ $_ } } @$columns )
+       ;
+       warn "# _current_filters ",dump($columns);
        return $current_filters;
 }