--- trunk/lib/Transports/Dispatcher.pm	2006/05/26 23:25:35	31
+++ trunk/lib/Transports/Dispatcher.pm	2006/06/05 14:27:50	55
@@ -8,19 +8,6 @@
 
 =head1 Transports operations
 
-=head2 transports
-
-list of all transports
-
-=cut
-
-on 'transports', run {
-	my $transports = Transports::Model::TransportCollection->new();
-    $transports->unlimit();
-
-	set transports => $transports;
-};
-
 =head2 new
 
 new transport
@@ -52,6 +39,22 @@
 	show('/edit');
 };
 
+=head2 /import/42
+
+import transport with request number C<42>
+
+=cut
+
+on qr'^/import/(\d+)', run {
+	my $id = $1;
+	my $t = Transports::Model::Transport->new();
+	$t->load_by_cols( id => $id );
+	Jifty->web->redirect( '/transports' ) unless ( $t->id );
+
+	set transport => Jifty->web->new_action( class => 'UpdateTransport', record => $t );
+	show('/import');
+};
+
 =head1 User operations
 
 =head2 /user/42
@@ -60,24 +63,18 @@
 
 =cut
 
-on qr'^/users?/?(\d*)', run {
-	my $id = $1;
+on qr'^/user/(\d+)', run {
+	my $u = Transports::Model::User->new();
+	$u->load_by_cols( id => $1 );
+
+	set user_id => $1;
+
+	set user => Jifty->web->new_action(
+		class => $u->id ? 'UpdateUser' : 'CreateUser',
+		record => $u
+	);
 
-	if ($id) {
-		my $u = Transports::Model::User->new();
-		$u->load_by_cols( id => $id );
-
-		set user => Jifty->web->new_action(
-			class => $u->id ? 'UpdateUser' : 'CreateUser',
-			record => $u
-		);
-		show('/user_form');
-	} else {
-		my $u = Transports::Model::UserCollection->new();
-		$u->unlimit();
-		set users => $u;
-		show('/users');
-	}
+	show('/user_form');
 };
 
 =head1 Login and logout operations
@@ -86,12 +83,16 @@
 
 =cut
 
-on 'login', run {
+on qr'^/login(/.*)?$', run {
+
+	my $return_url = $1 || '/';
+
     set 'action' =>
         Jifty->web->new_action( class => 'Login', moniker => 'loginbox' );
     set 'next' => Jifty->web->request->continuation
         || Jifty::Continuation->new(
-        request => Jifty::Request->new( path => "/" ) );
+        request => Jifty::Request->new( path => $return_url ) );
+	show '/login';
 };
 
 =head2 logout