git.shiar.nl
/
sheet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
perl: significant modules for other versions
[sheet.git]
/
word
/
edit.plp
diff --git
a/word/edit.plp
b/word/edit.plp
index 2968642860ae37a31326c04f10d96a291744c7a9..dcb4d3dd44e08aae860114e9eba781fe29a085be 100644
(file)
--- a/
word/edit.plp
+++ b/
word/edit.plp
@@
-153,6
+153,7
@@
elsif (defined $post{form}) {{
my $val = $colinfo->{-multiple} && @val ? \@val : $val[-1];
if (my $jsoncol = $colinfo->{-json}) {
$row->{$jsoncol}->{$col} = $val; # hash will be encoded
my $val = $colinfo->{-multiple} && @val ? \@val : $val[-1];
if (my $jsoncol = $colinfo->{-json}) {
$row->{$jsoncol}->{$col} = $val; # hash will be encoded
+ ref $_ eq 'HASH' or $_ = decode_json($_) for $replace->{$jsoncol} // ();
}
else {
$row->{$col} = $val;
}
else {
$row->{$col} = $val;
@@
-162,7
+163,7
@@
elsif (defined $post{form}) {{
while (my ($col, $val) = each %{$row}) {
# convert json subcolumns to database string
ref $val eq 'HASH' or next;
while (my ($col, $val) = each %{$row}) {
# convert json subcolumns to database string
ref $val eq 'HASH' or next;
- $val = { %{
decode_json($_)
}, %{$val} } for $replace->{$col} // (); # preserve unknown
+ $val = { %{
$_
}, %{$val} } for $replace->{$col} // (); # preserve unknown
defined $val->{$_} or delete $val->{$_} for keys %{$val}; # delete emptied
$row->{$col} = encode_json($val);
}
defined $val->{$_} or delete $val->{$_} for keys %{$val}; # delete emptied
$row->{$col} = encode_json($val);
}
@@
-214,13
+215,13
@@
elsif (defined $post{form}) {{
require Shiar_Sheet::ImagePrep;
my $image = Shiar_Sheet::ImagePrep->new($wordcol{source}->{-src}->($row));
my $reimage = eval {
require Shiar_Sheet::ImagePrep;
my $image = Shiar_Sheet::ImagePrep->new($wordcol{source}->{-src}->($row));
my $reimage = eval {
- ($imagecol->{source} // '') ne ($replace->{source} // '') or return;
+ ($imagecol->{source} // '') ne ($replace->{
image}->{
source} // '') or return;
$image->download($imagecol->{source});
};
!$@ or Alert(["Source image not found", $@]);
$image->download($imagecol->{source});
};
!$@ or Alert(["Source image not found", $@]);
- $reimage ||= $row->{
image} ~~ $replace->{image}; # different source
- $reimage ||= $row->{cover}
~~ $replace
->{cover}; # resize
+ $reimage ||= $row->{
convert} ~~ $replace->{image}->{convert}; # different
+ $reimage ||= $row->{cover}
~~ $replace->{image}
->{cover}; # resize
$reimage++ if $fields{rethumb}; # force refresh
if ($reimage) {
eval {
$reimage++ if $fields{rethumb}; # force refresh
if ($reimage) {
eval {