Merge branch 'master' into eval-code

diff --git a/lib/MojoFacets.pm b/lib/MojoFacets.pm
index 9a5b315..fb45ed5 100644 (file)
--- a/lib/MojoFacets.pm
+++ b/lib/MojoFacets.pm
@@ -47,7 +47,7 @@ sub startup {
     my $r = $self->routes;
 
     # Default route
-    $r->route('/:controller/:action/:id')->to('data#index', id => 1);
+    $r->route('/:controller/:action/:id')->to('data#index', id => 0);
 
 #      $self->plugin( 'request_timer' );
 

diff --git a/lib/MojoFacets/Data.pm b/lib/MojoFacets/Data.pm
index f8adc7f..3a02f05 100644 (file)
--- a/lib/MojoFacets/Data.pm
+++ b/lib/MojoFacets/Data.pm
@@ -531,6 +531,11 @@ sub _data_sorted_by {
 sub items {
        my $self = shift;
 
+       if ( my $show = $self->param('id') ) {
+               $self->param('show', $show);
+               warn "show $show\n";
+       }
+
        my $path = $self->session('path');
        $self->redirect_to('/data/index') unless defined $loaded->{ $path };
 

diff --git a/templates/admin.html.ep b/templates/admin.html.ep
index 8190794..e9b953c 100644 (file)
--- a/templates/admin.html.ep
+++ b/templates/admin.html.ep
@@ -7,7 +7,7 @@ items:
 % foreach my $show ( glob 'templates/data/items/*.html.ep' ) {
 %  $show =~ s{^.+/([^/]+)\.html\.ep$}{$1};
 %  my $class = session('show') eq $show ? 'class=active' : '';
-<a href="<%= url_for( controller => 'data', action => 'items' )->query( show => $show ) %>" <%= $class %>><%= $show %></a>
+<a href="<%= url_for( controller => 'data', action => 'items', id => $show ) %>" <%= $class %>><%= $show %></a>
 % }
 
 % if ( $self->can('_export_path') && glob $self->_export_path('*') ) {