[llvm-commits] [zorg] r147656 - in /zorg/trunk/lnt/lnt/server: reporting/runs.py ui/views.py

[Daniel Dunbar]

Author: ddunbar
Date: Fri Jan  6 09:14:54 2012
New Revision: 147656

URL: http://llvm.org/viewvc/llvm-project?rev=147656&view=rev
Log:
[lnt/v0.4] lnt.server.reporting: Fix the url in v4 email reports.

Modified:
    zorg/trunk/lnt/lnt/server/reporting/runs.py
    zorg/trunk/lnt/lnt/server/ui/views.py

Modified: zorg/trunk/lnt/lnt/server/reporting/runs.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/server/reporting/runs.py?rev=147656&r1=147655&r2=147656&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/server/reporting/runs.py (original)
+++ zorg/trunk/lnt/lnt/server/reporting/runs.py Fri Jan  6 09:14:54 2012
@@ -114,7 +114,7 @@
     if baseurl[-1] == '/':
         baseurl = baseurl[:-1]
 
-    report_url = """%s/%d""" % (baseurl, run.id)
+    report_url = """%s/v4/nt/%d""" % (baseurl, run.id)
     print >>report, report_url
     print >>report, """Nickname: %s:%d""" % (machine.name, machine.id)
     if 'name' in machine_parameters:

Modified: zorg/trunk/lnt/lnt/server/ui/views.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/server/ui/views.py?rev=147656&r1=147655&r2=147656&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/server/ui/views.py (original)
+++ zorg/trunk/lnt/lnt/server/ui/views.py Fri Jan  6 09:14:54 2012
@@ -14,7 +14,7 @@
 from flask import url_for
 
 from lnt.db import perfdb
-from lnt.server.ui.globals import v4_url_for
+from lnt.server.ui.globals import db_url_for, v4_url_for
 
 frontend = flask.Module(__name__)
 
@@ -648,7 +648,7 @@
 
     _, _, html_report = NTEmailReport.getReport(
         result=None, db=db, run=run,
-        baseurl=v4_url_for('v4_overview', _external=True),
+        baseurl=db_url_for('index', _external=True),
         was_added=True, will_commit=True, only_html_body=False)
 
     return make_response(html_report)
@@ -663,7 +663,7 @@
 
     _, text_report, _ = NTEmailReport.getReport(
         result=None, db=db, run=run,
-        baseurl=v4_url_for('v4_overview', _external=True),
+        baseurl=db_url_for('index', _external=True),
         was_added=True, will_commit=True, only_html_body=True)
 
     response = make_response(text_report)
@@ -718,7 +718,7 @@
     # webapp UI to be easy to correlate with the email reports.
     _, text_report, html_report = NTEmailReport.getReport(
         result=None, db=db, run=run,
-        baseurl=v4_url_for('v4_overview', _external=True),
+        baseurl=db_url_for('index', _external=True),
         was_added=True, will_commit=True, only_html_body=True)
 
     return render_template("v4_run.html", ts=ts, run=run, compare_to=compare_to,