diff options
author | morkt <> | 2015-01-02 10:22:25 +0100 |
---|---|---|
committer | Yorhel <git@yorhel.nl> | 2015-01-02 10:22:25 +0100 |
commit | 228cb96969a33a60c40dd4991a394460652010af (patch) | |
tree | 9d69e00562ae545b79ca8a899d2439c4800133d7 /lib/VNDB/DB | |
parent | 03585d77637a7052d0af2cdb1e4be66358412b6a (diff) |
staff: Fix deleting of staff + use JSON to pass data + minor fixes
Diffstat (limited to 'lib/VNDB/DB')
-rw-r--r-- | lib/VNDB/DB/Chars.pm | 7 | ||||
-rw-r--r-- | lib/VNDB/DB/VN.pm | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/lib/VNDB/DB/Chars.pm b/lib/VNDB/DB/Chars.pm index 50923941..15f00675 100644 --- a/lib/VNDB/DB/Chars.pm +++ b/lib/VNDB/DB/Chars.pm @@ -119,8 +119,11 @@ sub dbCharGet { JOIN vn_rev vr ON vr.id = vs.vid JOIN vn v ON v.latest = vs.vid !W - ORDER BY v.c_released, sa.name|, - { 'cr.id IN(!l)' => [[ keys %r ]], $o{vid} ? ('v.id = ?' => $o{vid}) : () } + ORDER BY v.c_released, sa.name|, { + 's.hidden = FALSE' => 1, + 'cr.id IN(!l)' => [[ keys %r ]], + $o{vid} ? ('v.id = ?' => $o{vid}) : (), + } )}); } } diff --git a/lib/VNDB/DB/VN.pm b/lib/VNDB/DB/VN.pm index edb55377..9ba27bbd 100644 --- a/lib/VNDB/DB/VN.pm +++ b/lib/VNDB/DB/VN.pm @@ -159,7 +159,7 @@ sub dbVNGet { JOIN staff_alias sa ON vs.aid = sa.id JOIN staff_rev sr ON sr.id = sa.rid JOIN staff s ON sr.id = s.latest - WHERE vs.vid IN(!l) + WHERE s.hidden = FALSE AND vs.vid IN(!l) ORDER BY vs.role ASC, sa.name ASC|, [ keys %r ] )}); @@ -173,7 +173,7 @@ sub dbVNGet { JOIN chars c ON c.id = vs.cid JOIN chars_rev cr ON cr.id = c.latest JOIN chars_vns cv ON cv.cid = cr.id AND cv.vid = vr.vid - WHERE vs.vid IN(!l) + WHERE s.hidden = FALSE AND vs.vid IN(!l) ORDER BY cv.role, cr.name|, [ keys %r ] )}); |