Revision 0842bb2c
Conversion explicite des textes vers UTF-8 pour utiliser datetime.strptime().
(+ correction espaces inutiles)
git-svn-id: https://vigilo-dev.si.c-s.fr/svn@4743 b22e2e97-25c9-44ff-b637-2e5ceca36478
vigiboard/controllers/root.py | ||
---|---|---|
163 | 163 |
# TRANSLATORS: http://www.dynarch.com/static/jscalendar-1.0/doc/html/reference.html#node_sec_5.3.5 |
164 | 164 |
# TRANSLATORS: http://docs.python.org/release/2.5/lib/module-time.html |
165 | 165 |
from_date = datetime.strptime( |
166 |
from_date, _('%Y-%m-%d %I:%M:%S %p')) |
|
166 |
from_date.encode('utf8'), |
|
167 |
_('%Y-%m-%d %I:%M:%S %p').encode('utf8')) |
|
167 | 168 |
except ValueError: |
168 | 169 |
# On ignore silencieusement la date invalide reçue. |
169 | 170 |
pass |
... | ... | |
177 | 178 |
# TRANSLATORS: http://www.dynarch.com/static/jscalendar-1.0/doc/html/reference.html#node_sec_5.3.5 |
178 | 179 |
# TRANSLATORS: http://docs.python.org/release/2.5/lib/module-time.html |
179 | 180 |
to_date = datetime.strptime( |
180 |
to_date, _('%Y-%m-%d %I:%M:%S %p')) |
|
181 |
to_date.encode('utf8'), |
|
182 |
_('%Y-%m-%d %I:%M:%S %p').encode('utf8')) |
|
181 | 183 |
except ValueError: |
182 | 184 |
# On ignore silencieusement la date invalide reçue. |
183 | 185 |
pass |
... | ... | |
443 | 445 |
aggregates.items.c.servicename, |
444 | 446 |
) |
445 | 447 |
aggregates.add_join((Event, CorrEvent.idcause == Event.idevent)) |
446 |
aggregates.add_join((aggregates.items,
|
|
448 |
aggregates.add_join((aggregates.items, |
|
447 | 449 |
Event.idsupitem == aggregates.items.c.idsupitem)) |
448 | 450 |
aggregates.add_filter(aggregates.items.c.idsupitem == idsupitem) |
449 | 451 |
|
... | ... | |
537 | 539 |
events = VigiboardRequest(user) |
538 | 540 |
events.add_table(CorrEvent) |
539 | 541 |
events.add_join((Event, CorrEvent.idcause == Event.idevent)) |
540 |
events.add_join((events.items,
|
|
542 |
events.add_join((events.items, |
|
541 | 543 |
Event.idsupitem == events.items.c.idsupitem)) |
542 | 544 |
events.add_filter(CorrEvent.idcorrevent.in_(ids)) |
543 | 545 |
|
544 | 546 |
events.generate_request() |
545 | 547 |
idevents = [cause.idcause for cause in events.req] |
546 | 548 |
|
547 |
# Si des changements sont survenus depuis que la
|
|
549 |
# Si des changements sont survenus depuis que la |
|
548 | 550 |
# page est affichée, on en informe l'utilisateur. |
549 | 551 |
last_modification = datetime.fromtimestamp(last_modification) |
550 | 552 |
cur_last_modification = get_last_modification_timestamp(idevents, None) |
... | ... | |
587 | 589 |
username=user.user_name, |
588 | 590 |
timestamp=datetime.now(), |
589 | 591 |
) |
590 |
DBSession.add(history)
|
|
592 |
DBSession.add(history) |
|
591 | 593 |
event.trouble_ticket = trouble_ticket |
592 | 594 |
|
593 | 595 |
# Changement du statut d'acquittement. |
... | ... | |
659 | 661 |
events = VigiboardRequest(user, False) |
660 | 662 |
events.add_table(CorrEvent.idcorrevent) |
661 | 663 |
events.add_join((Event, CorrEvent.idcause == Event.idevent)) |
662 |
events.add_join((events.items,
|
|
664 |
events.add_join((events.items, |
|
663 | 665 |
Event.idsupitem == events.items.c.idsupitem)) |
664 | 666 |
events.add_filter(CorrEvent.idcorrevent == idcorrevent) |
665 | 667 |
|
... | ... | |
769 | 771 |
|
770 | 772 |
return dict(groups=hierarchy) |
771 | 773 |
|
772 |
def get_last_modification_timestamp(event_id_list,
|
|
774 |
def get_last_modification_timestamp(event_id_list, |
|
773 | 775 |
value_if_none=datetime.now()): |
774 | 776 |
""" |
775 |
Récupère le timestamp de la dernière modification
|
|
777 |
Récupère le timestamp de la dernière modification |
|
776 | 778 |
opérée sur l'un des événements dont l'identifiant |
777 | 779 |
fait partie de la liste passée en paramètre. |
778 | 780 |
""" |
... | ... | |
809 | 811 |
except ImportError: |
810 | 812 |
pass |
811 | 813 |
return plugins_instances |
812 |
|
Also available in: Unified diff