Changeset 36827b in indico

Timestamp:

05/26/10 19:07:30 (3 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, new-webex, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

e68565

Parents:

357ac6

git-author:

Ian Rolewicz <ian.rolewicz@…> (05/21/10 16:22:21)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (05/26/10 19:07:30)

Message:

[FIX] Empty Default Location causes an error

• fixes #401
• fixes #345
• vars.js.tpl was trying to get Location.getDefaultLocation().friendlyName, but failed generating vars.js.tpl.tmp since Location.getDefaultLocation() returned None. Added if-statements to get an empty string as a default location if the latter was None.

File:

• indico/MaKaC/webinterface/tpls/js/vars.js.tpl (modified) (2 diffs)

indico/MaKaC/webinterface/tpls/js/vars.js.tpl

@@ -22 +22 @@
     locationList = None
 
+if Location.getDefaultLocation():
+    defaultLocation = Location.getDefaultLocation().friendlyName
+else:
+    defaultLocation = ""
 %>
 <% end %>
@@ -134 +138 @@
         category: <%= simplejson.dumps(list((k,k.title()) for k in MaterialFactoryRegistry._allowedMaterials['category'])) %>},
         WeekDays: <%= [ "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" ] %>,
-        DefaultLocation: '<%= str(Location.getDefaultLocation().friendlyName) %>',
+        DefaultLocation: '<%= str(defaultLocation) %>',
         Locations: <%= jsonEncode(locationList) %>
     },