diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-04-10 00:34:08 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-04-10 00:34:08 +0200 |
| commit | d9425a6b4ee791ad6f35457209800edfd4311da8 (patch) | |
| tree | 800d34322bdecea118fbbb62db376b1d0bbf4e05 /ishtar/furnitures/views.py | |
| parent | 3fcd45377c58b3427d134218b1976c764be3558f (diff) | |
| download | Ishtar-d9425a6b4ee791ad6f35457209800edfd4311da8.tar.bz2 Ishtar-d9425a6b4ee791ad6f35457209800edfd4311da8.zip | |
Show history in sheets (refs #349)
Diffstat (limited to 'ishtar/furnitures/views.py')
| -rw-r--r-- | ishtar/furnitures/views.py | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/ishtar/furnitures/views.py b/ishtar/furnitures/views.py index 0320ce5c9..43e663267 100644 --- a/ishtar/furnitures/views.py +++ b/ishtar/furnitures/views.py @@ -212,9 +212,7 @@ def get_item(model, func_name, default_name, extra_request_keys=[], items = items.order_by(sign + k) datas = [] if old: - print [item.pk for item in items] items = [item.get_previous(old) for item in items] - print [item.pk for item in items] for item in items: data = [item.pk] for k in model.TABLE_COLS: @@ -286,9 +284,23 @@ def show_item(model, name): except ObjectDoesNotExist: return HttpResponse(None) doc_type = 'type' in dct and dct.pop('type') + date = 'date' in dct and dct.pop('date') dct['item'], dct['item_name'] = item, name dct['window_id'] = "%s-%d-%s" % (name, item.pk, datetime.datetime.now().strftime('%M%s')) + if date: + try: + date = datetime.datetime.strptime(date, '%Y-%m-%d %H:%M:%S.%f') + item = item.get_previous(date=date) + assert item != None + except (ValueError, AssertionError): + return HttpResponse(None, mimetype='text/plain') + dct['previous'] = item._previous + dct['next'] = item._next + else: + historized = item.history.all() + if len(historized) > 1: + dct['previous'] = historized[1].history_date context_instance = RequestContext(request) context_instance.update(dct) n = datetime.datetime.now() |
