[Pkg-debile-commits] [debile-web] 01/01: Remove UUID for good

[Léo Cavaillé]

This is an automated email from the git hooks/post-receive script.

leo.cavaille-guest pushed a commit to branch master
in repository debile-web.

commit 8af46111299ca2097870f0bb6fba75db0cb12dc3
Author: Léo Cavaillé <leo at cavaille.net>
Date:   Fri Aug 23 13:20:13 2013 +0200

    Remove UUID for good
---
 debile/blueprints/frontend.py |   18 +++++++++---------
 templates/report.html         |    2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/debile/blueprints/frontend.py b/debile/blueprints/frontend.py
index a39d6ad..fcf1f29 100644
--- a/debile/blueprints/frontend.py
+++ b/debile/blueprints/frontend.py
@@ -221,7 +221,7 @@ def source(package_name, owner_name, package_version, run_number):
     for j in source_jobs:
         info = {}
         info['job'] = j
-        info['job_link'] = '/report/%s' % j.uuid
+        info['job_link'] = '/report/%s' % j.id
         if j.machine:
             info['job_machine_link'] = '/machine/%s' % j.machine.name
         if not j.is_finished():
@@ -245,7 +245,7 @@ def source(package_name, owner_name, package_version, run_number):
     for j in binaries_jobs:
         info = {}
         info['job'] = j
-        info['job_link'] = '/report/%s' % j.uuid
+        info['job_link'] = '/report/%s' % j.id
         if j.machine:
             info['job_machine_link'] = '/machine/%s' % j.machine.name
         if not j.is_finished():
@@ -293,13 +293,13 @@ def hacker(hacker_login):
     })
 
 
- at frontend.route("/report/<job_uuid>/")
-def report(job_uuid):
+ at frontend.route("/report/<job_id>/")
+def report(job_id):
 # TODO : design architecture Pending, firewose ?
 #    report = Report.load(report_id)
     config = Config()
     session = Session()
-    job_query = session.query(Job).filter(Job.uuid == job_uuid)
+    job_query = session.query(Job).filter(Job.id == job_id)
     try:
         job = job_query.one()
     except (NoResultFound, MultipleResultsFound):
@@ -318,14 +318,14 @@ def report(job_uuid):
         job_info['source_link'] = '/source/%s/%s/%s/%s' % (job.package.source.user.login, job.package.source.name, job.package.source.version, job.package.source.run)
 
     log_path = os.path.join(config.get('paths', 'job'),
-                        job_uuid, 'log.txt')
+                        job_id, 'log.txt')
 
-    firehose_link = "/static-job-reports/%s/firehose.xml" % job_uuid
-    log_link = "/static-job-reports/%s/log.txt" % job_uuid
+    firehose_link = "/static-job-reports/%s/firehose.xml" % job_id
+    log_link = "/static-job-reports/%s/log.txt" % job_id
 
     ### SCANDALOUS HACK
     if job.type == 'clanganalyzer':
-        scanbuild_link = "/static-job-reports/%s/scan-build/" % job_uuid
+        scanbuild_link = "/static-job-reports/%s/scan-build/" % job_id
     else:
         scanbuild_link = ""
 
diff --git a/templates/report.html b/templates/report.html
index b791476..98f21e5 100644
--- a/templates/report.html
+++ b/templates/report.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% block title %}Report for job {{job_info.job.uuid}}{% endblock %}
+{% block title %}Report for job id={{job_info.job.id}}{% endblock %}
 
 {% block content %}
 {% if job_info.job.package.type == 'binary' %}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-debile/debile-web.git