Fix ordering of script version

wooey · Jan 21, 2018 · b5a187a · b5a187a
1 parent ae7791c
commit b5a187a
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/wooey/views/views.py b/wooey/views/views.py
@@ -60,10 +60,12 @@ def get_context_data(self, **kwargs):
         script_version = ScriptVersion.objects.filter(
             script=self.object,
         )
-        script_version = script_version.filter(script_version=version) if version else script_version.order_by('script_version')
-        script_version = script_version.filter(script_iteration=iteration) if iteration else script_version.order_by('script_iteration')
+        if version:
+            script_version = script_version.filter(script_version=version)
+        if iteration:
+            script_version = script_version.filter(script_iteration=iteration)
 
-        script_version = script_version.last()
+        script_version = script_version.order_by('script_version', 'script_iteration').last()
 
         context['form'] = utils.get_form_groups(
             script_version=script_version,