Chris/ORB
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix problems with missing time values in display code

Browse Source
This commit is contained in:
Chris 2018-10-02 22:30:10 +01:00
parent 83950ff01b
commit 4198b66fc0
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
blocks/ORB/List.pm
View File

@ -73,7 +73,8 @@ sub _build_recipe {
}); });
} }
my $time = ($recipe -> {"preptime"} + $recipe -> {"cooktime"}) * 60; my $time = (($recipe -> {"preptime"} // 0) +
($recipe -> {"cooktime"} // 0) ) * 60;
return $self -> {"template"} -> load_template("list/recipe.tem", return $self -> {"template"} -> load_template("list/recipe.tem",
{ "%(id)s" => $recipe -> {"id"}, { "%(id)s" => $recipe -> {"id"},

3
blocks/ORB/Search.pm
View File

@ -71,7 +71,8 @@ sub _build_recipe {
}); });
} }
my $time = ($recipe -> {"preptime"} + $recipe -> {"cooktime"}) * 60; my $time = (($recipe -> {"preptime"} // 0) +
($recipe -> {"cooktime"} // 0) ) * 60;
return $self -> {"template"} -> load_template("search/recipe.tem", return $self -> {"template"} -> load_template("search/recipe.tem",
{ "%(id)s" => $recipe -> {"id"}, { "%(id)s" => $recipe -> {"id"},

2
blocks/ORB/View.pm
View File

@ -159,7 +159,7 @@ sub _generate_view {
my $cooktime = $recipe -> {"cooktime"} ? $self -> {"template"} -> humanise_seconds($recipe -> {"cooktime"} * 60) my $cooktime = $recipe -> {"cooktime"} ? $self -> {"template"} -> humanise_seconds($recipe -> {"cooktime"} * 60)
: "{L_VIEW_NOTSET}"; : "{L_VIEW_NOTSET}";
my $totaltime = $recipe -> {"preptime"} + $recipe -> {"cooktime"}; my $totaltime = ($recipe -> {"preptime"} // 0) + ($recipe -> {"cooktime"} // 0);
my $timereq = $totaltime ? $self -> {"template"} -> humanise_seconds($totaltime * 60) my $timereq = $totaltime ? $self -> {"template"} -> humanise_seconds($totaltime * 60)
: "{L_VIEW_NOTSET}"; : "{L_VIEW_NOTSET}";