From ae291290dfd388935de8a9bf56fd6aef72176fe8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Pedersen?= <bjoern.pedersen@frm2.tum.de>
Date: Wed, 24 Oct 2012 15:23:48 +0200
Subject: [PATCH] [FIX] javascript error due to None return
getPDFConversionStatus returns a plain None, should be a string.
---
indico/MaKaC/conference.py | 2 +-
1 Datei geÀndert, 1 Zeile hinzugefÌgt(+), 1 Zeile entfernt(-)
diff --git a/indico/MaKaC/conference.py b/indico/MaKaC/conference.py
index cb71774..cc9f4a5 100644
a
|
b
|
class Resource(CommonObjectBase): |
11620 | 11620 | |
11621 | 11621 | if self.pdfConversionRequestDate is not None and self.pdfConversionRequestDate + timedelta(seconds=50) > nowutc() : |
11622 | 11622 | return 'converting' |
11623 | | return None |
| 11623 | return 'None' |
11624 | 11624 | |
11625 | 11625 | |
11626 | 11626 | class Link(Resource): |