diff --git a/bin/init-schools b/bin/init-schools index 80d7d7340410797a8fef40ccf471e530efb2d071..a8f3f3258584b6990512c116c4b6599982b01a23 100755 --- a/bin/init-schools +++ b/bin/init-schools @@ -21,6 +21,7 @@ import mo.config as config import mo.db as db import mo.util from mo.util import die +from mo.util_format import timeformat mo.util.init_standalone() session = db.get_session() @@ -308,14 +309,14 @@ def create_action(ps: ProtoSchool, type: ActionType, msg: str) -> Action: print(f'>> {type.name} (#{school_id}, RED_IZO {ps.red_izo}): {msg}') if school_id > 0: print(f'\t# URL: {school_url(school_id)}') - logs = session.query(db.Log).filter_by(type=db.LogType.place, id=school_id).all() + logs = session.query(db.Log).filter_by(type=db.LogType.place, id=school_id).options(joinedload(db.LogType.user)).order_by(db.Log.changed_at).all() for log in logs: action = log.details.get('action', '?') reason = log.details.get('reason', '?') if action == 'new' or reason == 'init-schools': pass else: - print(f'\t# Log: {log.details}') + print(f'\t# Log ({timeformat(log.changed_at)} {log.user.full_name() if log.user else "system"}): {log.details}') if ps.unsure_region: print('\t# WARNING: Obec s nejistým regionem') return Action(type=type, school_id=school_id, values={})