Merge remote-tracking branch 'github/main'
This commit is contained in:
commit
fc2aa95656
2 changed files with 21 additions and 14 deletions
2
.github/workflows/perl.yml
vendored
2
.github/workflows/perl.yml
vendored
|
@ -13,7 +13,7 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
perl-version:
|
perl-version:
|
||||||
- '5.20-buster'
|
- '5.30-buster'
|
||||||
- 'latest'
|
- 'latest'
|
||||||
- 'threaded'
|
- 'threaded'
|
||||||
|
|
||||||
|
|
|
@ -571,6 +571,7 @@ sub import_v1 {
|
||||||
my $journey;
|
my $journey;
|
||||||
|
|
||||||
if ( not $error ) {
|
if ( not $error ) {
|
||||||
|
eval {
|
||||||
$journey = $self->journeys->get_single(
|
$journey = $self->journeys->get_single(
|
||||||
uid => $uid,
|
uid => $uid,
|
||||||
db => $db,
|
db => $db,
|
||||||
|
@ -578,7 +579,12 @@ sub import_v1 {
|
||||||
verbose => 1
|
verbose => 1
|
||||||
);
|
);
|
||||||
$error
|
$error
|
||||||
= $self->journeys->sanity_check( $journey, $payload->{lax} ? 1 : 0 );
|
= $self->journeys->sanity_check( $journey,
|
||||||
|
$payload->{lax} ? 1 : 0 );
|
||||||
|
};
|
||||||
|
if ($@) {
|
||||||
|
$error = $@;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($error) {
|
if ($error) {
|
||||||
|
@ -673,7 +679,8 @@ sub autocomplete {
|
||||||
= "document.addEventListener('DOMContentLoaded',function(){M.Autocomplete.init(document.querySelectorAll('.autocomplete'),{\n";
|
= "document.addEventListener('DOMContentLoaded',function(){M.Autocomplete.init(document.querySelectorAll('.autocomplete'),{\n";
|
||||||
$output .= 'minLength:3,limit:50,data:';
|
$output .= 'minLength:3,limit:50,data:';
|
||||||
$output
|
$output
|
||||||
.= encode_json( $self->stations->get_for_autocomplete( backend_id => $backend_id ) );
|
.= encode_json(
|
||||||
|
$self->stations->get_for_autocomplete( backend_id => $backend_id ) );
|
||||||
$output .= "\n});});\n";
|
$output .= "\n});});\n";
|
||||||
|
|
||||||
$self->render(
|
$self->render(
|
||||||
|
|
Loading…
Reference in a new issue