From 06548e44cb5c532de52013887891fa01a9ce72ed Mon Sep 17 00:00:00 2001
From: Benjamin Bertrand <benjamin.bertrand@esss.se>
Date: Tue, 7 Nov 2017 11:49:28 +0100
Subject: [PATCH] Cleaning
---
app/main/views.py | 2 +-
app/models.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/main/views.py b/app/main/views.py
index 4bde378..bc1fb38 100644
--- a/app/main/views.py
+++ b/app/main/views.py
@@ -68,7 +68,7 @@ def index():
@login_required
def view_item(ics_id):
item = Item.query.filter_by(ics_id=ics_id).first_or_404()
- return render_template('view_item.html', item=item.to_dict(extra=True))
+ return render_template('view_item.html', item=item.to_dict(long=True))
@bp.route('/qrcodes')
diff --git a/app/models.py b/app/models.py
index 8741342..e2be123 100644
--- a/app/models.py
+++ b/app/models.py
@@ -234,7 +234,7 @@ class Item(db.Model):
raise utils.CSEntryError('ICS id shall match [A-Z]{3}[0-9]{3}', status_code=422)
return string
- def to_dict(self, extra=False):
+ def to_dict(self, long=False):
d = {
'id': self.id,
'ics_id': self.ics_id,
@@ -247,7 +247,7 @@ class Item(db.Model):
'created': utils.format_field(self._created),
'parent': utils.format_field(self.parent),
}
- if extra:
+ if long:
d['children'] = [utils.format_field(child) for child in self.children]
d['history'] = self.history()
return d
--
GitLab