Unverified Commit 960de27f authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

move get_connecting_trains out of _cancelled_departure template

parent 35338125

lib/Travelynx/Controller/Traveling.pm

+20 −4
Original line number Diff line number Diff line
@@ -351,8 +351,15 @@ sub status_card { 
		$self->render( '_checked_in', journey => $status );

	}

	elsif ( $status->{cancellation} ) {

		$self->render( '_cancelled_departure',

			journey => $status->{cancellation} );

		my @connecting_trains = $self->get_connecting_trains(

			eva              => $status->{cancellation}{dep_eva},

			destination_name => $status->{cancellation}{arr_name}

		);

		$self->render(

			'_cancelled_departure',

			journey     => $status->{cancellation},

			connections => \@connecting_trains

		);

	}

	else {

		$self->render( '_checked_out', journey => $status );
@@ -627,10 +634,19 @@ sub station { 
				@results

				  = grep { $_->type . ' ' . $_->train_no eq $train } @results;

			}

			else {

				my $user = $self->get_user_status;

				if ( $user->{cancellation} ) {

					@connecting_trains = $self->get_connecting_trains(

						eva              => $user->{cancellation}{dep_eva},

						destination_name => $user->{cancellation}{arr_name}

					);

				}

				else {

					@connecting_trains = $self->get_connecting_trains(

						eva => $status->{station_eva} );

				}

			}



			$self->render(

				'departures',

templates/_cancelled_departure.html.ep

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
			in <a href="/s/<%= $journey->{dep_ds100} %>"><%= $journey->{dep_name} %></a>

			entfällt. Der Zugausfall auf der Fahrt nach <%= $journey->{arr_name} %> wurde bereits dokumentiert.

		</p>

		% if (my @connections = get_connecting_trains(eva => $journey->{dep_eva}, destination_name => $journey->{arr_name})) {

		% if (my @connections = @{stash('connections') // []}) {

			<p>Alternative Reisemöglichkeiten:</p>

			%= include '_connections', connections => \@connections, checkin_from => $journey->{dep_ds100};

		% }