From f92967f5c79a9d7107f5f366bc8fae2e2e243771 Mon Sep 17 00:00:00 2001 From: jacquelinemorrissette Date: Wed, 24 Feb 2021 22:45:03 -0500 Subject: [PATCH 1/3] Added version information to formList --- onadata/libs/serializers/xform_serializer.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/onadata/libs/serializers/xform_serializer.py b/onadata/libs/serializers/xform_serializer.py index ee48a53da..bd50265e8 100644 --- a/onadata/libs/serializers/xform_serializer.py +++ b/onadata/libs/serializers/xform_serializer.py @@ -1,6 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals, print_function, division, absolute_import +import json + from rest_framework import serializers from rest_framework.reverse import reverse @@ -82,7 +84,12 @@ class XFormListSerializer(serializers.Serializer): manifestUrl = serializers.SerializerMethodField('get_manifest_url') def get_version(self, obj): - return None + # Returns version data + # The data returned may vary depending on the contents of the + # version field in the settings of the XLS file when the asset was + # created or updated + obj_json = json.loads(obj.json) + return obj_json.get('version') @check_obj def get_hash(self, obj): From 8326aef0bbfddcc1b046cd4873fb7cb4014128b1 Mon Sep 17 00:00:00 2001 From: jacquelinemorrissette Date: Wed, 3 Mar 2021 20:41:43 -0500 Subject: [PATCH 2/3] Fixed requirements because newest version of twill is not compatible with python2 --- requirements/dev.pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/dev.pip b/requirements/dev.pip index 6c677c786..6876e1d83 100644 --- a/requirements/dev.pip +++ b/requirements/dev.pip @@ -8,7 +8,7 @@ ipdb ipython shell_command statsd -twill +twill==2.0.3 Werkzeug sqlparse pytest==3.10 From cfd4fd57b64cfb9e67a8c86808b2b8202ff8b278 Mon Sep 17 00:00:00 2001 From: JacquelineMorrissette <74968475+JacquelineMorrissette@users.noreply.github.com> Date: Thu, 20 May 2021 13:29:52 -0400 Subject: [PATCH 3/3] Update dev.pip --- requirements/dev.pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/dev.pip b/requirements/dev.pip index 6876e1d83..6c677c786 100644 --- a/requirements/dev.pip +++ b/requirements/dev.pip @@ -8,7 +8,7 @@ ipdb ipython shell_command statsd -twill==2.0.3 +twill Werkzeug sqlparse pytest==3.10