Revision de502147
Added by Frédéric Péters over 12 years ago
| calebasse/agenda/views.py | ||
|---|---|---|
| 72 | 72 |
for worker in workers: |
| 73 | 73 |
time_tables_worker = [tt for tt in time_tables if tt.worker.id == worker.id] |
| 74 | 74 |
occurrences_worker = [o for o in occurrences if worker.id in o.event.participants.values_list('id', flat=True)]
|
| 75 |
holidays_worker = [h for h in holidays if h.worker_id == worker.id]
|
|
| 75 |
holidays_worker = [h for h in holidays if h.worker_id in (None, worker.id)]
|
|
| 76 | 76 |
occurrences_workers[worker.id] = occurrences_worker |
| 77 | 77 |
time_tables_workers[worker.id] = time_tables_worker |
| 78 | 78 |
holidays_workers[worker.id] = holidays_worker |
Also available in: Unified diff
agenda: handle global holidays in agenda view (#2236)