diff options
author | Yorhel <git@yorhel.nl> | 2015-10-25 10:15:14 +0100 |
---|---|---|
committer | Yorhel <git@yorhel.nl> | 2015-10-25 10:15:14 +0100 |
commit | 5873b30d78f2883ba8aa7fcc9e5ce3e10b9605ae (patch) | |
tree | 5141375087866fa75a34be22b6d0c1775aa37a44 /lib/VNDB | |
parent | 799ae5fd9460448c98423d92b69428fc4be05dd1 (diff) |
Staff: Add error msg when removing used alias + fix bug in alias editing
The new database schema doesn't allow an alias to be removed when it is
still linked to a VN.
Diffstat (limited to 'lib/VNDB')
-rw-r--r-- | lib/VNDB/DB/Staff.pm | 4 | ||||
-rw-r--r-- | lib/VNDB/Handler/Staff.pm | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/lib/VNDB/DB/Staff.pm b/lib/VNDB/DB/Staff.pm index c8178aae..69f4d6b3 100644 --- a/lib/VNDB/DB/Staff.pm +++ b/lib/VNDB/DB/Staff.pm @@ -109,7 +109,7 @@ sub _enrich { } @$r; push @{$r{ delete $_->{id} }{roles}}, $_ for (@{$self->dbAll(q| - SELECT sa.id, v.id AS vid, sa.name, sa.original, v.c_released, v.title, v.original AS t_original, vs.role, vs.note + SELECT sa.id, sa.aid, v.id AS vid, sa.name, sa.original, v.c_released, v.title, v.original AS t_original, vs.role, vs.note FROM vn_staff vs JOIN vn v ON v.id = vs.id JOIN staff_alias sa ON vs.aid = sa.aid @@ -117,7 +117,7 @@ sub _enrich { ORDER BY v.c_released ASC, v.title ASC, vs.role ASC|, [ keys %r ] )}); push @{$r{ delete $_->{id} }{cast}}, $_ for (@{$self->dbAll(q| - SELECT sa.id, v.id AS vid, sa.name, sa.original, v.c_released, v.title, v.original AS t_original, c.id AS cid, c.name AS c_name, c.original AS c_original, vs.note + SELECT sa.id, sa.aid, v.id AS vid, sa.name, sa.original, v.c_released, v.title, v.original AS t_original, c.id AS cid, c.name AS c_name, c.original AS c_original, vs.note FROM vn_seiyuu vs JOIN vn v ON v.id = vs.id JOIN chars c ON c.id = vs.cid diff --git a/lib/VNDB/Handler/Staff.pm b/lib/VNDB/Handler/Staff.pm index 4bf6e63a..09d74930 100644 --- a/lib/VNDB/Handler/Staff.pm +++ b/lib/VNDB/Handler/Staff.pm @@ -180,7 +180,7 @@ sub _cast { sub edit { my($self, $sid, $rev) = @_; - my $s = $sid && $self->dbStaffGetRev(id => $sid, what => 'extended aliases', $rev ? (rev => $rev) : ())->[0]; + my $s = $sid && $self->dbStaffGetRev(id => $sid, what => 'extended aliases roles', $rev ? (rev => $rev) : ())->[0]; return $self->resNotFound if $sid && !$s->{id}; $rev = undef if !$s || $s->{lastrev}; @@ -227,6 +227,12 @@ sub edit { # reset aid to zero for newly added aliases. $_->{aid} *= $old_aliases{$_->{aid}} ? 1 : 0 for(@{$frm->{aliases}}); + # Make sure no aliases that have been linked to a VN are removed. + my %new_aliases = map +($_, 1), grep $_, $frm->{primary}, map $_->{aid}, @{$frm->{aliases}}; + $frm->{_err} = [ 'usedalias' ] if grep !$new_aliases{$_->{aid}}, @{$s->{roles}}, @{$self->{cast}}; + } + + if(!$frm->{_err}) { $frm->{ihid} = $frm->{ihid} ?1:0; $frm->{ilock} = $frm->{ilock}?1:0; $frm->{aid} = $frm->{primary} if $sid; |