Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
811f9defc4
|
|
@ -27,8 +27,7 @@ class Command(BaseCommand):
|
||||||
a.role,
|
a.role,
|
||||||
a.start_date,
|
a.start_date,
|
||||||
a.end_date,
|
a.end_date,
|
||||||
trim(CONCAT(p.firstname, ' ', p.lastname, ' ',
|
trim(CONCAT(p.firstname, ' ', p.lastname)
|
||||||
p.email,'')
|
|
||||||
) as name
|
) as name
|
||||||
from affiliations as a
|
from affiliations as a
|
||||||
join profiles p on p.id = a.profile_id
|
join profiles p on p.id = a.profile_id
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user