Sfoglia il codice sorgente

Initial event reporting for the term dashboard works now

master
Peter J. Jones 1 anno fa
parent
commit
4724ee9c01
Firmato da: Peter Jones <pjones@devalot.com> ID Chiave GPG: 9DAFAA8D01941E49
1 ha cambiato i file con 4 aggiunte e 4 eliminazioni
  1. 4
    4
      lib/Merkel/Operations/Term/Event.hs

+ 4
- 4
lib/Merkel/Operations/Term/Event.hs Vedi File

@@ -108,14 +108,14 @@ vmEventsAfter key cutoff =
, VirtualMachineConstructor
)

sql = "SELECT DISTINCT ON (vme_event) \
sql = "SELECT DISTINCT ON (vme_event, vme_machine) \
\ vme_machine, vme_time, vme_event, \
\ vm_name, vm_term, vm_assigned_student, vm_address, \
\ vm_available, 'vm_root_password#clear', 'vm_root_password#hashed', \
\ 'vm_student_password#clear', 'vm_student_password#hashed', vm_access_token \
\ vm_available, \"vm_root_password#clear\", \"vm_root_password#hashed\", \
\ \"vm_student_password#clear\", \"vm_student_password#hashed\", vm_access_token \
\ FROM virtual_machine_event_log, virtual_machine \
\ WHERE vme_machine = virtual_machine.id \
\ AND virtual_machine.vm_assigned_student IS NOT NULL \
\ AND virtual_machine.vm_term = ? \
\ AND vme_time >= ? \
\ ORDER BY vme_event, vme_time DESC"
\ ORDER BY vme_event, vme_machine, vme_time DESC"

Loading…
Annulla
Salva