X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Facl.py;h=e19b26912dd8234dc5148186431154a566f28b38;hb=d31ae14a9de247d47d9ff7b3f36705a58a065916;hp=568e21e46b6c28990c24e6e54f1eb8335068d5ae;hpb=c8349f01107a0ba259421b8527d9adfd64606576;p=dak.git diff --git a/dak/acl.py b/dak/acl.py index 568e21e4..e19b2691 100644 --- a/dak/acl.py +++ b/dak/acl.py @@ -84,14 +84,17 @@ def acl_export_per_source(acl_name): session = DBConn().session() acl = session.query(ACL).filter_by(name=acl_name).one() - query = """ + query = r""" SELECT f.fingerprint, (SELECT COALESCE(u.name, '') || ' <' || u.uid || '>' FROM uid u JOIN fingerprint f2 ON u.id = f2.uid WHERE f2.id = f.id) AS name, - STRING_AGG(a.source, ' ' ORDER BY a.source) + STRING_AGG( + a.source + || COALESCE(' (' || (SELECT fingerprint FROM fingerprint WHERE id = a.created_by_id) || ')', ''), + E',\n ' ORDER BY a.source) FROM acl_per_source a JOIN fingerprint f ON a.fingerprint_id = f.id LEFT JOIN uid u ON f.uid = u.id