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

[leif at geodynamics.org]

Author: leif
Date: 2008-07-23 16:17:22 -0700 (Wed, 23 Jul 2008)
New Revision: 12467

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 bogus URL in "Your simulation has finished running"
e-mail (another bug introduced in r12419).


Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/splash.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/splash.html	2008-07-22 17:43:44 UTC (rev 12466)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/splash.html	2008-07-23 23:17:22 UTC (rev 12467)
@@ -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.1.1</p>
+    <p>Version 3.1.2</p>
 
     <hr>
 

Modified: cs/portal/trunk/northridge/SeismoWebPortal/views.py
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/views.py	2008-07-22 17:43:44 UTC (rev 12466)
+++ cs/portal/trunk/northridge/SeismoWebPortal/views.py	2008-07-23 23:17:22 UTC (rev 12467)
@@ -285,6 +285,8 @@
 def updateRunStatus(request, daemonCode, objectId):
     from forms import RunStatusManipulator
 
+    root = rootURL(request, "%s/runs/" % daemonCode)
+
     manipulator = RunStatusManipulator()
 
     cluster = daemonConnect(daemonCode)
@@ -306,7 +308,7 @@
                 if run.status == 'error':
                     notifyAdminsOfFailedRun(run)
                 else:
-                    notifyUserOfSuccessfulRun(run, request)
+                    notifyUserOfSuccessfulRun(run, request, root)
             run.save()
             response.write(repr('OK'))
         return response
@@ -337,7 +339,7 @@
     return
 
 
-def notifyUserOfSuccessfulRun(run, request):
+def notifyUserOfSuccessfulRun(run, request, root):
     from django.core.mail import send_mail
 
     server = request.META['SERVER_NAME']
@@ -348,7 +350,7 @@
     kwds = dict(
         server = server,
         protocol = request.is_secure() and 'https' or 'http',
-        root = rootURL(request, "runs/"),
+        root = root,
         )
 
     subject = "Your simulation has finished running."

Modified: cs/portal/trunk/northridge/setup.py
===================================================================
--- cs/portal/trunk/northridge/setup.py	2008-07-22 17:43:44 UTC (rev 12466)
+++ cs/portal/trunk/northridge/setup.py	2008-07-23 23:17:22 UTC (rev 12467)
@@ -3,7 +3,7 @@
 
 setup(
     name = 'SeismoWebPortal', 
-    version = '3.1.1',
+    version = '3.1.2',
     url = 'http://www.geodynamics.org/',
     author = 'Leif Strand',
     author_email = 'leif at geodynamics.org',