diff options
| author | Yorhel <git@yorhel.nl> | 2019-10-31 18:26:06 +0100 |
|---|---|---|
| committer | Yorhel <git@yorhel.nl> | 2019-11-10 12:44:55 +0100 |
| commit | b581361bc5b789e25cf74e234876569258ed0894 (patch) | |
| tree | 55d895ac9a212f4eba04fda095f3faeaf421d8e8 /lib/VNWeb/User | |
| parent | b063b1fcf5810a6952fcde99bca2dbbbfb143d34 (diff) | |
ulist: "End date" -> "Finish date" + put placeholder values in Elm divs
Diffstat (limited to 'lib/VNWeb/User')
| -rw-r--r-- | lib/VNWeb/User/Lists.pm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/VNWeb/User/Lists.pm b/lib/VNWeb/User/Lists.pm index 7f9ef214..2a812079 100644 --- a/lib/VNWeb/User/Lists.pm +++ b/lib/VNWeb/User/Lists.pm @@ -121,30 +121,30 @@ sub vn_ { b_ class => 'grayedout', $v->{notes} if $v->{notes}; }; td_ class => 'tc3', sub { + my %l = map +($_,1), $v->{labels}->@*; + my @l = grep $l{$_->{id}} && $_->{id} != 7, @$labels; + my $txt = @l ? join ', ', map $_->{label}, @l : '-'; if($own) { # XXX: Copying the entire $labels list for each entry is rather inefficient, would be nice if we could store that globally. my @labels = grep $_->{id} != 7, @$labels; elm_ 'ULists.LabelEdit' => $VNLABELS_OUT, - { uid => $uid, vid => $v->{id}, labels => \@labels, selected => [ grep $_ != 7, $v->{labels}->@* ] }; + { uid => $uid, vid => $v->{id}, labels => \@labels, selected => [ grep $_ != 7, $v->{labels}->@* ] }, $txt; } else { - my %l = map +($_,1), $v->{labels}->@*; - my @l = grep $l{$_->{id}} && $_->{id} != 7, @$labels; - join_ ', ', sub { txt_ $_->{label} }, @l if @l; - txt_ '-' if !@l; + txt_ $txt; } }; td_ mkclass(tc4 => 1, compact => $own, stealth => $own), sub { txt_ fmtvote $v->{vote} if !$own; - elm_ 'ULists.VoteEdit' => $VNVOTE, { uid => $uid, vid => $v->{id}, vote => fmtvote($v->{vote}) } if $own; + elm_ 'ULists.VoteEdit' => $VNVOTE, { uid => $uid, vid => $v->{id}, vote => fmtvote($v->{vote}) }, fmtvote $v->{vote} if $own; }; td_ class => 'tc5', fmtdate $v->{added}, 'compact'; td_ class => 'tc6', sub { txt_ $v->{started}||'' if !$own; - elm_ 'ULists.DateEdit' => $VNDATE, { uid => $uid, vid => $v->{id}, date => $v->{started}||'', start => 1 } if $own; + elm_ 'ULists.DateEdit' => $VNDATE, { uid => $uid, vid => $v->{id}, date => $v->{started}||'', start => 1 }, $v->{started}||'' if $own; }; td_ class => 'tc7', sub { txt_ $v->{finished}||'' if !$own; - elm_ 'ULists.DateEdit' => $VNDATE, { uid => $uid, vid => $v->{id}, date => $v->{finished}||'', start => 0 } if $own; + elm_ 'ULists.DateEdit' => $VNDATE, { uid => $uid, vid => $v->{id}, date => $v->{finished}||'', start => 0 }, $v->{finished}||'' if $own; }; }; @@ -213,7 +213,7 @@ sub listing_ { td_ class => 'tc4', sub { txt_ 'Vote'; sortable_ 'vote', $opt, \&url }; td_ class => 'tc5', sub { txt_ 'Added'; sortable_ 'added', $opt, \&url }; td_ class => 'tc6', sub { txt_ 'Start date'; sortable_ 'started', $opt, \&url }; - td_ class => 'tc7', sub { txt_ 'End date'; sortable_ 'finished', $opt, \&url }; + td_ class => 'tc7', sub { txt_ 'Finish date';sortable_ 'finished', $opt, \&url }; }}; vn_ $uid, $own, $_, $lst->[$_], $labels for (0..$#$lst); }; |