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

Allow more characters in ingredient notes

Browse Source
This commit is contained in:
Chris 2019-02-15 21:15:54 +00:00
parent e8dbbfc354
commit 7ad5943b41
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blocks/ORB/Common.pm
View File

@ -297,7 +297,7 @@ sub _validate_ingredient {
# Notes get copied, as long as they don't contain junk # Notes get copied, as long as they don't contain junk
if($ingdata -> {"notes"}) { if($ingdata -> {"notes"}) {
if($ingdata -> {"notes"} =~ /$self->{formats}->{notes}/) { if($ingdata -> {"notes"} =~ /$self->{formats}->{notes}/) {
$ingredient -> {"notes"} = $ingdata -> {"notes"}; $ingredient -> {"notes"} = $self -> {"template"} -> html_clean($ingdata -> {"notes"});
} else { } else {
$errors .= $self -> {"template"} -> load_template("error/error_item.tem", $errors .= $self -> {"template"} -> load_template("error/error_item.tem",
{ "%(error)s" => "{L_ERR_BADNOTES}" }); { "%(error)s" => "{L_ERR_BADNOTES}" });

2
modules/ORB.pm
View File

@ -79,7 +79,7 @@ sub new {
"quantity" => '^[\d\w./]+$', "quantity" => '^[\d\w./]+$',
"sepname" => '^[-\w,. ]{1,255}$', "sepname" => '^[-\w,. ]{1,255}$',
"ingredient" => '^[-\w,. ]{1,255}$', "ingredient" => '^[-\w,. ]{1,255}$',
"notes" => '^[-()\w,. ]{1,255}$', "notes" => '^[-()\w,."!\'\\/£$%;:@#?><* ]{1,255}$',
}; };
return $self; return $self;