From 595b3ddf57b8cda271cb58d4ee8ffcb25df94107 Mon Sep 17 00:00:00 2001 From: Silas Snider Date: Sun, 4 Nov 2012 22:04:43 -0800 Subject: [PATCH 1/2] adding api endpoint to get JSON version of cert --- main.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/main.py b/main.py index e2bd811..fdcc574 100644 --- a/main.py +++ b/main.py @@ -453,11 +453,11 @@ def get(self): cert_id = int(self.request.get('id')) except (ValueError, TypeError): return self.error(404) + cert_format = self.request.get('format', 'html') + self.show_cert(cert_id, cert_format) - self.show_cert(cert_id) - - def show_cert(self, cert_id): + def show_cert(self, cert_id, cert_format): cert = models.Certification.get_by_id(cert_id) if not cert: return self.error(404) @@ -505,9 +505,12 @@ def show_cert(self, cert_id): char_id = int(char_id) return self.show_cert_progress(data, char_id) - template = jinja_environment.get_template("view_cert.html") - page = template.render(data) - self.response.out.write(page) + if cert_format == 'html': + template = jinja_environment.get_template("view_cert.html") + page = template.render(data) + self.response.out.write(page) + else: + self.response.out.write(json.dumps(dict(name=cert.name, skills=skills))) def show_cert_progress(self, data, char_id): character = None From 07c03f0f65ee7e0d8686f0ffe1ac88f8cf1840e5 Mon Sep 17 00:00:00 2001 From: Silas Snider Date: Sun, 4 Nov 2012 22:12:12 -0800 Subject: [PATCH 2/2] Rationalize if clause order --- main.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main.py b/main.py index fdcc574..1ac4c70 100644 --- a/main.py +++ b/main.py @@ -505,12 +505,12 @@ def show_cert(self, cert_id, cert_format): char_id = int(char_id) return self.show_cert_progress(data, char_id) - if cert_format == 'html': + if cert_format == 'json': + self.response.out.write(json.dumps(dict(name=cert.name, skills=skills))) + else: template = jinja_environment.get_template("view_cert.html") page = template.render(data) self.response.out.write(page) - else: - self.response.out.write(json.dumps(dict(name=cert.name, skills=skills))) def show_cert_progress(self, data, char_id): character = None