[cig-commits] r16025 - in cs/portal/trunk/northridge: . SeismoWebPortal SeismoWebPortal/templates/SeismoWebPortal

[leif at geodynamics.org]

Author: leif
Date: 2009-11-20 18:50:47 -0800 (Fri, 20 Nov 2009)
New Revision: 16025

Modified:
   cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/splash.html
   cs/portal/trunk/northridge/SeismoWebPortal/views.py
   cs/portal/trunk/northridge/setup.py
Log:
Fixed portal crash:
TypeError: cannot concatenate 'str' and 'int' objects


Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/splash.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/splash.html	2009-11-21 02:26:51 UTC (rev 16024)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/splash.html	2009-11-21 02:50:47 UTC (rev 16025)
@@ -7,7 +7,7 @@
 
     <h1><img src="{{root}}/images/cig.gif"> <img src="{{root}}/images/seismogram.gif"><br>CIG Seismology Web Portal</h1>
 
-    <p>Version 3.3.2</p>
+    <p>Version 3.3.3</p>
 
     <hr>
 

Modified: cs/portal/trunk/northridge/SeismoWebPortal/views.py
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/views.py	2009-11-21 02:26:51 UTC (rev 16024)
+++ cs/portal/trunk/northridge/SeismoWebPortal/views.py	2009-11-21 02:50:47 UTC (rev 16025)
@@ -363,7 +363,7 @@
     server = request.META['SERVER_NAME']
     port = request.META['SERVER_PORT']
     if port and port != 80 and port != "80":
-        server += ":" + port
+        server += ":" + str(port)
 
     kwds = dict(
         server = server,

Modified: cs/portal/trunk/northridge/setup.py
===================================================================
--- cs/portal/trunk/northridge/setup.py	2009-11-21 02:26:51 UTC (rev 16024)
+++ cs/portal/trunk/northridge/setup.py	2009-11-21 02:50:47 UTC (rev 16025)
@@ -3,7 +3,7 @@
 
 setup(
     name = 'SeismoWebPortal', 
-    version = '3.3.2',
+    version = '3.3.3',
     url = 'http://www.geodynamics.org/',
     author = 'Leif Strand',
     author_email = 'leif at geodynamics.org',