PrivateCoffee/travelynx
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix ajax refresh of public status card (trim .html suffix)

Browse source
This commit is contained in:
Daniel Friesel 2022-02-20 21:45:51 +01:00
parent 209e291821
commit 01aec7e977
No known key found for this signature in database
GPG key ID: 100D5BFB5166E005
2 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Travelynx.pm
View file

@ -2520,7 +2520,7 @@ sub startup {
$r->get('/reg/:id/:token')->to('account#verify'); $r->get('/reg/:id/:token')->to('account#verify');
$r->get('/status/:name')->to('traveling#user_status'); $r->get('/status/:name')->to('traveling#user_status');
$r->get('/status/:name/:ts')->to('traveling#user_status'); $r->get('/status/:name/:ts')->to('traveling#user_status');
$r->get('/ajax/status/:name')->to('traveling#public_status_card'); $r->get('/ajax/status/#name')->to('traveling#public_status_card');
$r->get('/ajax/status/:name/:ts')->to('traveling#public_status_card'); $r->get('/ajax/status/:name/:ts')->to('traveling#public_status_card');
$r->get('/p/:name')->to('traveling#public_profile'); $r->get('/p/:name')->to('traveling#public_profile');
$r->get('/p/:name/j/:id')->to('traveling#public_journey_details'); $r->get('/p/:name/j/:id')->to('traveling#public_journey_details');

31
lib/Travelynx/Controller/Traveling.pm
View file

@ -58,9 +58,10 @@ sub user_status {
$ts $ts
and ( not $status->{checked_in} and ( not $status->{checked_in}
or $status->{sched_departure}->epoch != $ts ) or $status->{sched_departure}->epoch != $ts )
and ( $user->{public_level} & 0x20 and (
or $user->{public_level} & 0x20
( $user->{public_level} & 0x10 and $self->is_user_authenticated ) ) or ( $user->{public_level} & 0x10 and $self->is_user_authenticated )
)
) )
{ {
for my $candidate ( for my $candidate (
@ -173,9 +174,10 @@ sub public_profile {
if ( if (
$user $user
and ( $user->{public_level} & 0x22 and (
or $user->{public_level} & 0x22
( $user->{public_level} & 0x11 and $self->is_user_authenticated ) ) or ( $user->{public_level} & 0x11 and $self->is_user_authenticated )
)
) )
{ {
my $status = $self->get_user_status( $user->{id} ); my $status = $self->get_user_status( $user->{id} );
@ -233,9 +235,10 @@ sub public_journey_details {
if ( if (
$user $user
and ( $user->{public_level} & 0x20 and (
or $user->{public_level} & 0x20
( $user->{public_level} & 0x10 and $self->is_user_authenticated ) ) or ( $user->{public_level} & 0x10 and $self->is_user_authenticated )
)
) )
{ {
my $journey = $self->journeys->get_single( my $journey = $self->journeys->get_single(
@ -312,15 +315,17 @@ sub public_status_card {
my ($self) = @_; my ($self) = @_;
my $name = $self->stash('name'); my $name = $self->stash('name');
$name =~ s{[.]html$}{};
my $user = $self->users->get_privacy_by_name( name => $name ); my $user = $self->users->get_privacy_by_name( name => $name );
delete $self->stash->{layout}; delete $self->stash->{layout};
if ( if (
$user $user
and ( $user->{public_level} & 0x02 and (
or $user->{public_level} & 0x02
( $user->{public_level} & 0x01 and $self->is_user_authenticated ) ) or ( $user->{public_level} & 0x01 and $self->is_user_authenticated )
)
) )
{ {
my $status = $self->get_user_status( $user->{id} ); my $status = $self->get_user_status( $user->{id} );
@ -1293,7 +1298,7 @@ sub add_journey_form {
$self->render( $self->render(
'add_journey', 'add_journey',
with_autocomplete => 1, with_autocomplete => 1,
error => error =>
'Zug muss als „Typ Nummer“ oder „Typ Linie Nummer“ eingegeben werden.' 'Zug muss als „Typ Nummer“ oder „Typ Linie Nummer“ eingegeben werden.'
); );
return; return;