word edit: multiinput styling for configured columns

[sheet.git] / writer.plp

diff --git a/writer.plp b/writer.plp
index cf19db4904e583610886c58e1e8257186954c4e2..3f9ed98bc647c1e7b2a909a6f920c3fdf8568c93 100644 (file)
--- a/writer.plp
+++ b/writer.plp
@@ -31,6 +31,7 @@ form > ul > li > label + * {
        width: 40em;
 }
 
+.multiinput,
 input,select {
        box-sizing: border-box;
        flex-grow: 1;
@@ -153,12 +154,18 @@ if (exists $get{copy}) {
        $row = {%{$row}{ qw(prio lang cat) }};
 }
 elsif ($ENV{REQUEST_METHOD} eq 'POST') {{
+       sub parseinput {
+               return if not length $_[0];
+               require Encode;
+               return Encode::decode_utf8($_[0]);
+       }
+
        my $replace = $row;
-       $row = {%post{keys %wordcol}};
-       $row->{$_} = [grep {length} @{ $post{"\@$_"} }] for grep {
-               ref $wordcol{$_} eq 'HASH' and $wordcol{$_}->{-multiple}
-       } keys %wordcol;
-       $_ = length ? $_ : undef for values %{$row};
+       $row = {map { $_ =>
+               ref $wordcol{$_} eq 'HASH' && $wordcol{$_}->{-multiple} ?
+                       [ map { parseinput($_) } $post{'@'.$_}->@* ] :
+               scalar parseinput($post{$_})
+       } keys %wordcol};
 
        if (!$row->{form}) {
                if ($row->{ref} ne 'delete') {
@@ -190,8 +197,8 @@ elsif ($ENV{REQUEST_METHOD} eq 'POST') {{
                        $db->insert(word => {
                                ref   => $row->{id},
                                lang  => $lang,
-                               form  => $val,
-                       });
+                               form  => $_,
+                       }) for parseinput($val);
                        delete $fields{$field};
                }
                return 1;
@@ -299,18 +306,19 @@ package Shiar_Sheet::FormRow {
                        );
                }
                else {
+                       my $multiple = ref $val eq 'ARRAY' || $attr->{-multiple};
                        return (
                                (map {
                                        sprintf('<label for="%s">%s</label>', $col, $_)
                                } $attr->{-label} // ()),
-                               ref $val ne 'ARRAY' ? () : '<span class="inline multiinput">',
+                               $multiple ? '<span class="inline multiinput">' : (),
                                (map {
                                        sprintf('<input name="%s" value="%s" />', $col, EscapeHTML($_))
                                } ref $val eq 'ARRAY' ? @{$val} : ()),
                                sprintf('<input id="%s" name="%1$s" value="%s"%s />',
-                                       $col, ref $val eq 'ARRAY' ? '' : EscapeHTML($val), $html
+                                       $col, $multiple ? '' : EscapeHTML($val), $html
                                ),
-                               ref $val ne 'ARRAY' ? () : '</span>',
+                               $multiple ? '</span>' : (),
                                (map {
                                        sprintf '<img id="%spreview" src="/%s" alt="%s"%s />',
                                                $col, $_, $row->{form}, $col eq 'source' ? ' hidden' : '';