diff options
author | Yorhel <git@yorhel.nl> | 2020-05-28 19:11:24 +0200 |
---|---|---|
committer | Yorhel <git@yorhel.nl> | 2020-05-28 19:11:24 +0200 |
commit | 980b704417133dbbdec6f2571620dc3dcab2bb40 (patch) | |
tree | 87b0cfe0429f9a0a027c4124aba6032e9ba557e8 /lib/VNWeb/Staff/Edit.pm | |
parent | e36bfde55478f4ae5d83ee73845a348a92386bca (diff) |
Staff::Edit: Make sure not to remove referenced aliases on revert
Diffstat (limited to 'lib/VNWeb/Staff/Edit.pm')
-rw-r--r-- | lib/VNWeb/Staff/Edit.pm | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/lib/VNWeb/Staff/Edit.pm b/lib/VNWeb/Staff/Edit.pm index 0de89f44..937fe111 100644 --- a/lib/VNWeb/Staff/Edit.pm +++ b/lib/VNWeb/Staff/Edit.pm @@ -11,6 +11,7 @@ my $FORM = { name => { maxlength => 200 }, original => { maxlength => 200, required => 0, default => '' }, inuse => { anybool => 1, _when => 'out' }, + wantdel => { anybool => 1, _when => 'out' }, } }, desc => { required => 0, default => '', maxlength => 5000 }, gender => { default => 'unknown', enum => [qw[unknown m f]] }, @@ -39,10 +40,15 @@ TUWF::get qr{/$RE{srev}/edit} => sub { $e->{authmod} = auth->permDbmod; $e->{editsum} = $e->{chrev} == $e->{maxrev} ? '' : "Reverted to revision s$e->{id}.$e->{chrev}"; - enrich_merge aid => sub { - 'SELECT aid, EXISTS(SELECT 1 FROM vn_staff WHERE aid = x.aid UNION ALL SELECT 1 FROM vn_seiyuu WHERE aid = x.aid) AS inuse - FROM unnest(', sql_array(@$_), '::int[]) AS x(aid)' - }, $e->{alias}; + my $alias_inuse = 'EXISTS(SELECT 1 FROM vn_staff WHERE aid = sa.aid UNION ALL SELECT 1 FROM vn_seiyuu WHERE aid = sa.aid)'; + enrich_merge aid => sub { "SELECT aid, $alias_inuse AS inuse, false AS wantdel FROM unnest(", sql_array(@$_), '::int[]) AS sa(aid)' }, $e->{alias}; + + # If we're reverting to an older revision, we have to make sure all the + # still referenced aliases are included. + push $e->{alias}->@*, tuwf->dbAlli( + "SELECT aid, name, original, true AS inuse, true AS wantdel + FROM staff_alias sa WHERE $alias_inuse AND sa.id =", \$e->{id}, 'AND sa.aid NOT IN', [ map $_->{aid}, $e->{alias}->@* ] + )->@* if $e->{chrev} != $e->{maxrev}; my $name = (grep $_->{aid} == $e->{aid}, @{$e->{alias}})[0]{name}; framework_ title => "Edit $name", type => 's', dbobj => $e, tab => 'edit', |